From 27272097e6492ac8919a3132d28e72aa9645bebc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 24 Feb 2021 20:37:34 +0000 Subject: dockwin.hxx doesn't need to include floatwin.hxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib0408f715c9a12f32ce2f8049d2c9c7272201d76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111504 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- .../source/layoutmanager/toolbarlayoutmanager.cxx | 1 + framework/source/uielement/toolbarmanager.cxx | 1 + include/vcl/dockwin.hxx | 54 +++------------------- sc/source/ui/cctrl/checklistmenu.cxx | 1 + sfx2/source/appl/childwin.cxx | 1 + .../devtools/DevelopmentToolDockingWindow.cxx | 2 + sfx2/source/dialog/dockwin.cxx | 1 + sfx2/source/dialog/splitwin.cxx | 1 + starmath/source/ElementsDockingWindow.cxx | 1 + starmath/source/view.cxx | 1 + svtools/source/uno/popupwindowcontroller.cxx | 1 + svx/source/engine3d/float3d.cxx | 2 + toolkit/source/awt/vclxwindow.cxx | 1 + vcl/source/app/salvtables.cxx | 1 + vcl/source/control/calendar.cxx | 1 + vcl/source/window/dockwin.cxx | 41 ++++++++++++++++ vcl/source/window/taskpanelist.cxx | 1 + vcl/source/window/toolbox.cxx | 1 + vcl/source/window/toolbox2.cxx | 1 + 19 files changed, 66 insertions(+), 48 deletions(-) diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 4182dba99590..157299180999 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 6902bcf49e00..6a52ba57b578 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 5de80d36432e..e86dc00a09c2 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_DOCKWIN_HXX -#define INCLUDED_VCL_DOCKWIN_HXX +#pragma once #include +#include #include -#include #include #include +class ToolBox; +class FloatingWindow; +enum class FloatWinPopupFlags; + // data to be sent with docking events struct DockingData { @@ -335,49 +338,6 @@ public: virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; }; - -inline void DockingWindow::RollDown() -{ - if ( mpFloatWin ) - mpFloatWin->RollDown(); - mbRollUp = false; -} - -inline bool DockingWindow::IsRollUp() const -{ - if ( mpFloatWin ) - return mpFloatWin->IsRollUp(); - return mbRollUp; -} - - -inline void DockingWindow::SetMinOutputSizePixel( const Size& rSize ) -{ - if ( mpFloatWin ) - mpFloatWin->SetMinOutputSizePixel( rSize ); - maMinOutSize = rSize; -} - -inline const Size& DockingWindow::GetMinOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetMinOutputSizePixel(); - return maMinOutSize; -} - -inline void DockingWindow::SetFloatingPos( const Point& rNewPos ) -{ - if ( mpFloatWin ) - mpFloatWin->SetPosPixel( rNewPos ); - else - maFloatPos = rNewPos; -} - -inline void DockingWindow::SetIdleDebugName( const char *pDebugName ) -{ - maLayoutIdle.SetDebugName( pDebugName ); -} - class VCL_DLLPUBLIC DropdownDockingWindow : public DockingWindow { protected: @@ -402,6 +362,4 @@ public: virtual void dispose() override; }; -#endif // INCLUDED_VCL_DOCKWIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 19c098a8d96e..2e33aed9767e 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4a70d0c8592f..b07dc5b5bb40 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx index 6bd92f17256d..fec7cdfc34ad 100644 --- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx +++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx @@ -18,6 +18,8 @@ #include #include +#include + #include "SelectionChangeHandler.hxx" using namespace css; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index c7596a43bc75..7d0a09b60715 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 2e910f8d2fb0..6c96c0e4eb12 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index aae6027bbdc4..5daf36d50120 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 3d732bbc5b4d..563cce24467e 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index fe7eac4ff847..ff3d4ebed962 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 8f5da0ce79e3..b21609d724b1 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -49,6 +49,8 @@ #include #include +#include + #include using namespace com::sun::star; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 1799022f553f..d2e015fd793d 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7bb05907ecba..207708bf56d5 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index efcfc0c63800..68c4d74950ef 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 8689e914bfd1..498ebdfbb9f4 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -1058,6 +1058,47 @@ IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Timer*, void) setPosSizeOnContainee(); } +void DockingWindow::RollDown() +{ + if ( mpFloatWin ) + mpFloatWin->RollDown(); + mbRollUp = false; +} + +bool DockingWindow::IsRollUp() const +{ + if ( mpFloatWin ) + return mpFloatWin->IsRollUp(); + return mbRollUp; +} + +void DockingWindow::SetMinOutputSizePixel( const Size& rSize ) +{ + if ( mpFloatWin ) + mpFloatWin->SetMinOutputSizePixel( rSize ); + maMinOutSize = rSize; +} + +const Size& DockingWindow::GetMinOutputSizePixel() const +{ + if ( mpFloatWin ) + return mpFloatWin->GetMinOutputSizePixel(); + return maMinOutSize; +} + +void DockingWindow::SetFloatingPos( const Point& rNewPos ) +{ + if ( mpFloatWin ) + mpFloatWin->SetPosPixel( rNewPos ); + else + maFloatPos = rNewPos; +} + +void DockingWindow::SetIdleDebugName( const char *pDebugName ) +{ + maLayoutIdle.SetDebugName( pDebugName ); +} + DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference& rFrame, bool bTearable) : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 1cfb8ba92757..20ec9db82c5f 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -18,6 +18,7 @@ */ #include +#include #include #include diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 49f7765a7b01..eff09817c4a0 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 4336a0975901..06569732a145 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include -- cgit