include/svx/devtools/DevelopmentToolChildWindow.hxx | 24 ++++++++++++
include/svx/devtools/DevelopmentToolDockingWindow.hxx | 8 ----
sc/source/ui/app/scdll.cxx | 2 -
sc/source/ui/view/tabvwsh.cxx | 2 -
sd/source/ui/app/sddll.cxx | 2 -
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 -
sd/source/ui/view/drvwshrg.cxx | 2 -
sd/source/ui/view/outlnvsh.cxx | 2 -
svx/Library_svx.mk | 1
svx/source/devtools/DevelopmentToolChildWindow.cxx | 30 ++++++++++++++++
svx/source/devtools/DevelopmentToolDockingWindow.cxx | 14 -------
sw/source/uibase/app/swmodule.cxx | 2 -
sw/source/uibase/shells/basesh.cxx | 2 -
13 files changed, 63 insertions(+), 30 deletions(-)
New commits:
commit 52c7eac6df6bca750752a7706eb8e1b43d7312d1
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sun Jan 10 10:51:52 2021 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Jan 13 12:00:36 2021 +0100
devtools: move DevelopmentToolChildWindow to its own file
Change-Id: I12326479afb5756729b62ff3676f995d16f64aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109045
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/svx/devtools/DevelopmentToolChildWindow.hxx
b/include/svx/devtools/DevelopmentToolChildWindow.hxx
new file mode 100644
index 000000000000..34849da762e0
--- /dev/null
+++ b/include/svx/devtools/DevelopmentToolChildWindow.hxx
@@ -0,0 +1,24 @@
+/* -*- 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/.
+ *
+ */
+
+#pragma once
+
+#include <svx/svxdllapi.h>
+#include <sfx2/childwin.hxx>
+
+class SAL_WARN_UNUSED SVX_DLLPUBLIC DevelopmentToolChildWindow final : public
SfxChildWindow
+{
+ SFX_DECL_CHILDWINDOW_WITHID(DevelopmentToolChildWindow);
+
+ DevelopmentToolChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId,
SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 656f51a0fa13..2856bc3698df 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -20,14 +20,6 @@
#include <unordered_map>
-class SAL_WARN_UNUSED SVX_DLLPUBLIC DevelopmentToolChildWindow final : public
SfxChildWindow
-{
- SFX_DECL_CHILDWINDOW_WITHID(DevelopmentToolChildWindow);
-
- DevelopmentToolChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId,
SfxBindings* pBindings,
- SfxChildWinInfo* pInfo);
-};
-
class SAL_WARN_UNUSED SVX_DLLPUBLIC DevelopmentToolDockingWindow final :
public SfxDockingWindow
{
private:
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 35c3071e9a28..2749a46d1af9 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -25,7 +25,7 @@
#include <comphelper/lok.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/app.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <avmedia/mediatoolbox.hxx>
#include <NumberFormatControl.hxx>
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index e7f2fafe53cc..e67c7e27b52a 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -23,7 +23,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <sfx2/viewfac.hxx>
#include <cellvalue.hxx>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 32bf8646573c..fe6da0a503cd 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -75,7 +75,7 @@
#include <svx/zoomsliderctrl.hxx>
#include <svx/tbxctl.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <comphelper/lok.hxx>
#include <sdabstdlg.hxx>
#include <sdfilter.hxx>
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index ef85346c4a05..c0264c4c8418 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -51,7 +51,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <svx/svxids.hrc>
#include <vcl/EnumContext.hxx>
#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index ccde86763911..f8e048e7ce4a 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -29,7 +29,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <svx/f3dchild.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <svx/svxids.hrc>
#include <svx/hyperdlg.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index b7434886e7cc..6fb3f057c6e5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -79,7 +79,7 @@
#include <DrawDocShell.hxx>
#include <OutlineView.hxx>
#include <framework/FrameworkHelper.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <memory>
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 18b5cc64cb37..8a67a5f4b5db 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/customshapes/EnhancedCustomShapeEngine \
svx/source/customshapes/EnhancedCustomShapeFontWork \
svx/source/customshapes/EnhancedCustomShapeHandle \
+ svx/source/devtools/DevelopmentToolChildWindow \
svx/source/devtools/DevelopmentToolDockingWindow \
svx/source/dialog/AccessibilityCheckDialog \
svx/source/dialog/_bmpmask \
diff --git a/svx/source/devtools/DevelopmentToolChildWindow.cxx
b/svx/source/devtools/DevelopmentToolChildWindow.cxx
new file mode 100644
index 000000000000..3f95f3e7267c
--- /dev/null
+++ b/svx/source/devtools/DevelopmentToolChildWindow.cxx
@@ -0,0 +1,30 @@
+/* -*- 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/.
+ *
+ */
+
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+
+#include <svx/svxids.hrc>
+
+SFX_IMPL_DOCKINGWINDOW_WITHID(DevelopmentToolChildWindow,
SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW);
+
+DevelopmentToolChildWindow::DevelopmentToolChildWindow(vcl::Window*
pParentWindow, sal_uInt16 nId,
+ SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo)
+ : SfxChildWindow(pParentWindow, nId)
+{
+ VclPtr<DevelopmentToolDockingWindow> pWin
+ = VclPtr<DevelopmentToolDockingWindow>::Create(pBindings, this,
pParentWindow);
+ SetWindow(pWin);
+ SetAlignment(SfxChildAlignment::BOTTOM);
+ pWin->Initialize(pInfo);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index ac97e9134b17..0b3dbd06a9e5 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -90,20 +90,6 @@ private:
} // end anonymous namespace
-SFX_IMPL_DOCKINGWINDOW_WITHID(DevelopmentToolChildWindow,
SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW);
-
-DevelopmentToolChildWindow::DevelopmentToolChildWindow(vcl::Window*
pParentWindow, sal_uInt16 nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* pInfo)
- : SfxChildWindow(pParentWindow, nId)
-{
- VclPtr<DevelopmentToolDockingWindow> pWin
- = VclPtr<DevelopmentToolDockingWindow>::Create(pBindings, this,
pParentWindow);
- SetWindow(pWin);
- SetAlignment(SfxChildAlignment::BOTTOM);
- pWin->Initialize(pInfo);
-}
-
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings*
pInputBindings,
SfxChildWindow*
pChildWindow,
vcl::Window*
pParent)
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index ee9c5ebd286d..3d6462513857 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -89,7 +89,7 @@
#include <modcfg.hxx>
#include <fontcfg.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <swatrset.hxx>
#include <idxmrk.hxx>
#include <wordcountdialog.hxx>
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 7dcb362ca240..1523f40c5a84 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -85,7 +85,7 @@
#include <svx/fmshell.hxx>
#include <SwRewriter.hxx>
#include <svx/galleryitem.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <svx/devtools/DevelopmentToolChildWindow.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <memory>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
