devtools: move devtools from svx to sfx2

It's a better suited location for devtools as we can access the classes when we handle the .uno:DevelopmentToolsDockingWindow event. Change-Id: I753ca56808804c9cf6713920f92cd7d313f1f156 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110733 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-02-08 17:11:17 +09:00
parent 9afdfc80a3
commit a1ca311061
21 changed files with 29 additions and 30 deletions
--- a/include/sfx2/devtools/DevelopmentToolChildWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolChildWindow.hxx
@@ -10,10 +10,10 @@

 #pragma once

-#include <svx/svxdllapi.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/childwin.hxx>

-class SAL_WARN_UNUSED SVX_DLLPUBLIC DevelopmentToolChildWindow final : public SfxChildWindow
+class SAL_WARN_UNUSED SFX2_DLLPUBLIC DevelopmentToolChildWindow final : public SfxChildWindow
 {
    SFX_DECL_CHILDWINDOW_WITHID(DevelopmentToolChildWindow);

--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -10,21 +10,21 @@

 #pragma once

-#include <svx/svxdllapi.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/dockwin.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>

+#include <sfx2/devtools/DocumentModelTreeHandler.hxx>
+
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/frame/XController.hpp>

-#include <svx/devtools/DocumentModelTreeHandler.hxx>
-
 #include <unordered_map>

-class SVX_DLLPUBLIC DevelopmentToolDockingWindow final : public SfxDockingWindow
+class SFX2_DLLPUBLIC DevelopmentToolDockingWindow final : public SfxDockingWindow
 {
 private:
    std::unique_ptr<weld::Label> mpClassNameLabel;
--- a/include/sfx2/devtools/DocumentModelTreeHandler.hxx
+++ b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
@@ -10,7 +10,7 @@

 #pragma once

-#include <svx/svxdllapi.h>
+#include <sfx2/dllapi.h>
 #include <vcl/weld.hxx>

 #include <com/sun/star/uno/XInterface.hpp>
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <avmedia/mediatoolbox.hxx>
 #include <NumberFormatControl.hxx>

--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <sfx2/viewfac.hxx>

 #include <cellvalue.hxx>
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -13,7 +13,7 @@
 manual changes will be rewritten by the next run of update_pch.sh (which presumably
 also fixes all possible problems, so it's usually better to use it).

- Generated on 2021-02-05 16:11:07 using:
+ Generated on 2021-02-11 16:54:57 using:
 ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local

 If after updating build fails, use the following command to locate conflicting headers:
@@ -324,6 +324,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/chalign.hxx>
 #include <sfx2/childwin.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
@@ -385,7 +386,6 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxColorChildWindow.hxx>
 #include <svx/bmpmask.hxx>
-#include <svx/devtools/DevelopmentToolChildWindow.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/extrusionbar.hxx>
@@ -449,6 +449,7 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/xtable.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/UnitConversion.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/degree.hxx>
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <comphelper/lok.hxx>
 #include <sdabstdlg.hxx>
 #include <sdfilter.hxx>
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/EnumContext.hxx>
 #include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -28,8 +28,8 @@
 #include <svx/SvxColorChildWindow.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <svx/f3dchild.hxx>
-#include <svx/devtools/DevelopmentToolChildWindow.hxx>

 #include <svx/svxids.hrc>
 #include <svx/hyperdlg.hxx>
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>

 #include <memory>

--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -162,6 +162,9 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
    sfx2/source/control/charmapcontrol \
    sfx2/source/control/charwin \
    sfx2/source/control/unoctitm \
+    sfx2/source/devtools/DevelopmentToolChildWindow \
+    sfx2/source/devtools/DevelopmentToolDockingWindow \
+    sfx2/source/devtools/DocumentModelTreeHandler \
    sfx2/source/dialog/alienwarn \
    sfx2/source/dialog/backingcomp \
    sfx2/source/dialog/backingwindow \
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/custominfopage \
 	sfx2/uiconfig/ui/decktitlebar \
 	sfx2/uiconfig/ui/descriptioninfopage \
+	sfx2/uiconfig/ui/developmenttool \
 	sfx2/uiconfig/ui/dockingwindow \
 	sfx2/uiconfig/ui/documentfontspage \
 	sfx2/uiconfig/ui/documentinfopage \
--- a/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
+++ b/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
@@ -8,10 +8,9 @@
 *
 */

-#include <svx/devtools/DevelopmentToolChildWindow.hxx>
-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
-
-#include <svx/svxids.hrc>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
+#include <sfx2/sfxsids.hrc>

 SFX_IMPL_DOCKINGWINDOW_WITHID(DevelopmentToolChildWindow, SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW);

--- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -10,7 +10,7 @@

 #include <memory>

-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>

 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,6 @@

 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
-#include <svx/svxids.hrc>

 #include <sfx2/objsh.hxx>

@@ -444,7 +443,7 @@ DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
                                                           SfxChildWindow* pChildWindow,
                                                           vcl::Window* pParent)
    : SfxDockingWindow(pInputBindings, pChildWindow, pParent, "DevelopmentTool",
-                       "svx/ui/developmenttool.ui")
+                       "sfx/ui/developmenttool.ui")
    , mpClassNameLabel(m_xBuilder->weld_label("class_name_value_id"))
    , mpClassListBox(m_xBuilder->weld_tree_view("class_listbox_id"))
    , mpDocumentModelTreeView(m_xBuilder->weld_tree_view("leftside_treeview_id"))
--- a/sfx2/source/devtools/DocumentModelTreeHandler.cxx
+++ b/sfx2/source/devtools/DocumentModelTreeHandler.cxx
@@ -10,7 +10,7 @@

 #include <memory>

-#include <svx/devtools/DocumentModelTreeHandler.hxx>
+#include <sfx2/devtools/DocumentModelTreeHandler.hxx>

 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
--- a/sfx2/source/devtools/SelectionChangeHandler.hxx
+++ b/sfx2/source/devtools/SelectionChangeHandler.hxx
@@ -12,7 +12,7 @@

 #include <memory>

-#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>

 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -104,9 +104,6 @@ $(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/devtools/DocumentModelTreeHandler \
    svx/source/dialog/AccessibilityCheckDialog \
    svx/source/dialog/_bmpmask \
    svx/source/dialog/charmap \
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/deletefooterdialog \
 	svx/uiconfig/ui/depthwindow \
 	svx/uiconfig/ui/directionwindow \
-	svx/uiconfig/ui/developmenttool \
 	svx/uiconfig/ui/docking3deffects \
 	svx/uiconfig/ui/dockingcolorreplace \
 	svx/uiconfig/ui/dockingcolorwindow \
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <swatrset.hxx>
 #include <idxmrk.hxx>
 #include <wordcountdialog.hxx>
--- 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
 #include <com/sun/star/gallery/GalleryItemType.hpp>
 #include <memory>