Skip to content

C
core
Kaydet (Commit) 71cf1aef authored tarafından Bryan Quigley's avatar Bryan Quigley Kaydeden (comit) jan iversen
Dosyalara gözat
Seçenekler

Remove unneeded Pane code in Presenter Console 

This code hasn't been touched (on purpose) in years, it appears
to have been used to resize part of the console. (It's prefed off)

Change-Id: Iaaeaa8a95c71ae91299bbeeea24869bf2a237b6b
Reviewed-on: https://gerrit.libreoffice.org/24663Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
Tested-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 0c7558f5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 226 deletions
compilerplugins/clang/store/constantfunction.cxx
Dosyayı görüntüle @ 71cf1aef
......@@ -344,10 +344,6 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (aFunctionName == "sdext::presenter::PresenterFrameworkObserver::True") {
return true;
}
// hidden behind the ENABLE_PANE_RESIZING macro
if (aFunctionName == "sdext::presenter::PresenterWindowManager::UpdateWindowList") {
return true;
}
// callback, sw/source/core/doc/tblrwcl.cxx
if (aFunctionName == "lcl_DelOtherBox") {
return true;
......
sdext/Library_PresenterScreen.mk
Dosyayı görüntüle @ 71cf1aef
......@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
sdext/source/presenter/PresenterPaintManager \
sdext/source/presenter/PresenterPane \
sdext/source/presenter/PresenterPaneBase \
sdext/source/presenter/PresenterPaneBorderManager \
sdext/source/presenter/PresenterPaneBorderPainter \
sdext/source/presenter/PresenterPaneContainer \
sdext/source/presenter/PresenterPaneFactory \
......
sdext/source/presenter/PresenterPaneBorderManager.hxx deleted 100644 → 0
Dosyayı görüntüle @ 0c7558f5
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBORDERMANAGER_HXX
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBORDERMANAGER_HXX
// The body of this file is only used when PresenterWindowManager defines
// the preprocessor symbol ENABLE_PANE_RESIZING, which by default is not the
// case.
#ifdef ENABLE_PANE_RESIZING
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
#include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/awt/XMouseMotionListener.hpp>
#include <com/sun/star/awt/XPointer.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/drawing/framework/XPane.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <rtl/ref.hxx>
namespace sdext { namespace presenter {
class PresenterController;
namespace {
typedef ::cppu::WeakComponentImplHelper <
css::lang::XInitialization,
css::awt::XMouseListener,
css::awt::XMouseMotionListener
> PresenterPaneBorderManagerInterfaceBase;
}
/** Manage the interactive moving and resizing of panes.
*/
class PresenterPaneBorderManager
: protected ::cppu::BaseMutex,
public PresenterPaneBorderManagerInterfaceBase
{
public:
PresenterPaneBorderManager (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterPaneBorderManager();
PresenterPaneBorderManager(const PresenterPaneBorderManager&) = delete;
PresenterPaneBorderManager& operator=(const PresenterPaneBorderManager&) = delete;
virtual void SAL_CALL disposing();
static OUString getImplementationName_static();
static css::uno::Sequence< OUString > getSupportedServiceNames_static();
static css::uno::Reference<css::uno::XInterface> Create(
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
// XInitialization
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
throw (css::uno::Exception, css::uno::RuntimeException);
// XMouseListener
virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
// XMouseMotionListener
virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException);
// lang::XEventListener
virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException);
private:
enum BorderElement { Top, TopLeft, TopRight, Left, Right, BottomLeft, BottomRight, Bottom,
Content, Outside };
::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
/** The parent window is stored so that it can be invalidated when one
of its children is resized or moved. It is assumed to be the parent
window of all outer windows stored in maWindowList.
*/
css::uno::Reference<css::awt::XWindow> mxParentWindow;
typedef ::std::pair<css::uno::Reference<css::awt::XWindow>,
css::uno::Reference<css::awt::XWindow> > WindowDescriptor;
typedef ::std::vector<WindowDescriptor> WindowList;
WindowList maWindowList;
sal_Int32 mnPointerType;
css::awt::Point maDragAnchor;
BorderElement meDragType;
css::uno::Reference<css::awt::XWindow> mxOuterDragWindow;
css::uno::Reference<css::awt::XWindow> mxInnerDragWindow;
css::uno::Reference<css::awt::XPointer> mxPointer;
BorderElement ClassifyBorderElementUnderMouse (
const css::uno::Reference<css::awt::XWindow>& rxOuterDragWindow,
const css::uno::Reference<css::awt::XWindow>& rxInnerDragWindow,
const css::awt::Point aPosition) const;
void CreateWindows (const css::uno::Reference<css::awt::XWindow>& rxParentWindow);
void CaptureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow);
void ReleaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow);
/** This method throws a DisposedException when the object has already been
disposed.
*/
void ThrowIfDisposed()
throw (css::lang::DisposedException);
};
} } // end of namespace ::sd::presenter
#endif // ENABLE_PANE_RESIZING
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sdext/source/presenter/PresenterWindowManager.cxx
Dosyayı görüntüle @ 71cf1aef
......@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#undef ENABLE_PANE_RESIZING
//#define ENABLE_PANE_RESIZING
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include "PresenterWindowManager.hxx"
......@@ -28,7 +25,6 @@
#include "PresenterHelper.hxx"
#include "PresenterPaintManager.hxx"
#include "PresenterPaneBase.hxx"
#include "PresenterPaneBorderManager.hxx"
#include "PresenterPaneBorderPainter.hxx"
#include "PresenterPaneContainer.hxx"
#include "PresenterPaneFactory.hxx"
......@@ -86,7 +82,7 @@ PresenterWindowManager::PresenterWindowManager (
maLayoutListeners(),
mbIsMouseClickPending(false)
{
UpdateWindowList();
}
PresenterWindowManager::~PresenterWindowManager()
......@@ -112,9 +108,6 @@ void SAL_CALL PresenterWindowManager::disposing()
{
(*iPane)->mxBorderWindow->removeWindowListener(this);
(*iPane)->mxBorderWindow->removeFocusListener(this);
#ifndef ENABLE_PANE_RESIZING
(*iPane)->mxBorderWindow->removeMouseListener(this);
#endif
}
}
}
......@@ -313,15 +306,7 @@ void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent&
void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException, std::exception)
{
#ifndef ENABLE_PANE_RESIZING
if (mbIsMouseClickPending)
{
mbIsMouseClickPending = false;
mpPresenterController->HandleMouseClick(rEvent);
}
#else
(void)rEvent;
#endif
}
void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent)
......@@ -1121,56 +1106,6 @@ Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolyg
return xPolyPolygon;
}
void PresenterWindowManager::UpdateWindowList()
{
#ifdef ENABLE_PANE_RESIZING
try
{
OSL_ASSERT(mxComponentContext.is());
Reference<lang::XComponent> xComponent (mxPaneBorderManager, UNO_QUERY);
if (xComponent.is())
xComponent->dispose();
Reference<lang::XMultiComponentFactory> xFactory (mxComponentContext->getServiceManager());
if (xFactory.is())
{
Sequence<Any> aArguments (1 + mpPaneContainer->maPanes.size()*2);
sal_Int32 nIndex (0);
aArguments[nIndex++] = Any(mxParentWindow);
for (sal_uInt32 nPaneIndex=0; nPaneIndex<mpPaneContainer->maPanes.size(); ++nPaneIndex)
{
if ( ! mpPaneContainer->maPanes[nPaneIndex]->mbIsActive)
continue;
const Reference<awt::XWindow> xBorderWindow (
mpPaneContainer->maPanes[nPaneIndex]->mxBorderWindow);
const Reference<awt::XWindow> xContentWindow (
mpPaneContainer->maPanes[nPaneIndex]->mxContentWindow);
const Reference<awt::XWindow2> xBorderWindow2(xBorderWindow, UNO_QUERY);
if (xBorderWindow.is()
&& xContentWindow.is()
&& ( ! xBorderWindow2.is() || xBorderWindow2->isVisible()))
{
aArguments[nIndex++] = Any(xBorderWindow);
aArguments[nIndex++] = Any(xContentWindow);
}
}
aArguments.realloc(nIndex);
rtl::Reference<PresenterPaneBorderManager> pManager (
new PresenterPaneBorderManager (
mxComponentContext,
mpPresenterController));
pManager->initialize(aArguments);
mxPaneBorderManager.set(static_cast<XWeak*>(pManager.get()));
}
}
catch (RuntimeException&)
{
}
#endif
}
void PresenterWindowManager::Invalidate()
{
......@@ -1181,7 +1116,6 @@ void PresenterWindowManager::Update()
mxClipPolygon = nullptr;
mbIsLayoutPending = true;
UpdateWindowList();
Invalidate();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment