aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-02-24 20:37:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-02-25 21:12:08 +0100
commit27272097e6492ac8919a3132d28e72aa9645bebc (patch)
treef3e9092140a2f0cfde90b217099050d11aceeca3
parentd37b9b2f9d6340a4f100f764b02e6f562072c004 (diff)
dockwin.hxx doesn't need to include floatwin.hxx
Change-Id: Ib0408f715c9a12f32ce2f8049d2c9c7272201d76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111504 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx1
-rw-r--r--framework/source/uielement/toolbarmanager.cxx1
-rw-r--r--include/vcl/dockwin.hxx54
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx1
-rw-r--r--sfx2/source/appl/childwin.cxx1
-rw-r--r--sfx2/source/devtools/DevelopmentToolDockingWindow.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx1
-rw-r--r--sfx2/source/dialog/splitwin.cxx1
-rw-r--r--starmath/source/ElementsDockingWindow.cxx1
-rw-r--r--starmath/source/view.cxx1
-rw-r--r--svtools/source/uno/popupwindowcontroller.cxx1
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--toolkit/source/awt/vclxwindow.cxx1
-rw-r--r--vcl/source/app/salvtables.cxx1
-rw-r--r--vcl/source/control/calendar.cxx1
-rw-r--r--vcl/source/window/dockwin.cxx41
-rw-r--r--vcl/source/window/taskpanelist.cxx1
-rw-r--r--vcl/source/window/toolbox.cxx1
-rw-r--r--vcl/source/window/toolbox2.cxx1
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 <toolkit/helper/vclunohelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <vcl/i18nhelp.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/dockingarea.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
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 <svtools/imgdef.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/syswin.hxx>
#include <vcl/taskpanelist.hxx>
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 <vcl/dllapi.h>
+#include <vcl/syswin.hxx>
#include <o3tl/deleter.hxx>
-#include <vcl/floatwin.hxx>
#include <memory>
#include <vector>
+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 <vcl/decoview.hxx>
#include <vcl/event.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
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 <sal/log.hxx>
#include <tools/debug.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/app.hxx>
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 <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
+#include <vcl/floatwin.hxx>
+
#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 <vcl/svapp.hxx>
#include <vcl/timer.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/idle.hxx>
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
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 <tools/debug.hxx>
#include <vcl/event.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/timer.hxx>
#include <vcl/svapp.hxx>
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 <sfx2/sfxmodelfactory.hxx>
#include <svl/stritem.hxx>
#include <vcl/event.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/settings.hxx>
#include <vcl/uitest/eventdescription.hxx>
#include <vcl/uitest/logger.hxx>
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 <svl/itemset.hxx>
#include <svl/poolitem.hxx>
#include <svl/stritem.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/transfer.hxx>
#include <svtools/colorcfg.hxx>
#include <svl/whiter.hxx>
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 <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
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 <svtools/unitconv.hxx>
#include <svx/float3d.hxx>
+#include <vcl/floatwin.hxx>
+
#include <bitmaps.hlst>
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 <toolkit/helper/property.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <tools/color.hxx>
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 <tools/helpers.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/builder.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/fixed.hxx>
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 <vcl/toolkit/calendar.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/dockwin.hxx>
+#include <vcl/floatwin.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/i18n/Weekdays.hpp>
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<css::frame::XFrame>& 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 <vcl/dockwin.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/taskpanelist.hxx>
#include <svdata.hxx>
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 <vcl/commandinfoprovider.hxx>
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/accel.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
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 <vcl/svapp.hxx>
#include <vcl/idle.hxx>
#include <vcl/bitmap.hxx>
+#include <vcl/floatwin.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/menu.hxx>