summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/devtools/DevelopmentToolChildWindow.hxx (renamed from include/svx/devtools/DevelopmentToolChildWindow.hxx)4
-rw-r--r--include/sfx2/devtools/DevelopmentToolDockingWindow.hxx (renamed from include/svx/devtools/DevelopmentToolDockingWindow.hxx)8
-rw-r--r--include/sfx2/devtools/DocumentModelTreeHandler.hxx (renamed from include/svx/devtools/DocumentModelTreeHandler.hxx)2
-rw-r--r--sc/source/ui/app/scdll.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh.cxx2
-rw-r--r--sd/inc/pch/precompiled_sd.hxx5
-rw-r--r--sd/source/ui/app/sddll.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx2
-rw-r--r--sd/source/ui/view/drvwshrg.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sfx2/Library_sfx.mk3
-rw-r--r--sfx2/UIConfig_sfx.mk1
-rw-r--r--sfx2/source/devtools/DevelopmentToolChildWindow.cxx (renamed from svx/source/devtools/DevelopmentToolChildWindow.cxx)7
-rw-r--r--sfx2/source/devtools/DevelopmentToolDockingWindow.cxx (renamed from svx/source/devtools/DevelopmentToolDockingWindow.cxx)5
-rw-r--r--sfx2/source/devtools/DocumentModelTreeHandler.cxx (renamed from svx/source/devtools/DocumentModelTreeHandler.cxx)2
-rw-r--r--sfx2/source/devtools/SelectionChangeHandler.hxx (renamed from svx/source/devtools/SelectionChangeHandler.hxx)2
-rw-r--r--sfx2/uiconfig/ui/developmenttool.ui (renamed from svx/uiconfig/ui/developmenttool.ui)0
-rw-r--r--svx/Library_svx.mk3
-rw-r--r--svx/UIConfig_svx.mk1
-rw-r--r--sw/source/uibase/app/swmodule.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx2
21 files changed, 29 insertions, 30 deletions
diff --git a/include/svx/devtools/DevelopmentToolChildWindow.hxx b/include/sfx2/devtools/DevelopmentToolChildWindow.hxx
index 34849da762e0..adf5adf44980 100644
--- a/include/svx/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);
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index cdb20c081ba4..1ed166239949 100644
--- a/include/svx/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;
diff --git a/include/svx/devtools/DocumentModelTreeHandler.hxx b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
index fad725726cfb..5b752b172b4e 100644
--- a/include/svx/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>
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 2749a46d1af9..56d5e106e042 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/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 e67c7e27b52a..fdad3b66af33 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
#include <sfx2/viewfac.hxx>
#include <cellvalue.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index a4257ad31a82..bd3957cf2ca7 100644
--- 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>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index fe6da0a503cd..828ab885e9dd 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/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 25f3acafa9f0..d2f6d32ab191 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/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 f8e048e7ce4a..792d5b833a54 100644
--- 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>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6fb3f057c6e5..7068a519a96a 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
#include <memory>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4673541ec989..52ace3c503fe 100644
--- 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 \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 635b77324998..7878e618db45 100644
--- 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 \
diff --git a/svx/source/devtools/DevelopmentToolChildWindow.cxx b/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
index 3f95f3e7267c..6a196d45e9a3 100644
--- a/svx/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);
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
index bcb554a2668e..89f9e878d69b 100644
--- a/svx/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"))
diff --git a/svx/source/devtools/DocumentModelTreeHandler.cxx b/sfx2/source/devtools/DocumentModelTreeHandler.cxx
index 5cc293c7fe44..e29ce03ad47a 100644
--- a/svx/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>
diff --git a/svx/source/devtools/SelectionChangeHandler.hxx b/sfx2/source/devtools/SelectionChangeHandler.hxx
index b719eb5ee916..bfb7035e4d8a 100644
--- a/svx/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>
diff --git a/svx/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui
index e3f3bc78e9e8..e3f3bc78e9e8 100644
--- a/svx/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index d22639450f84..f7b947934546 100644
--- 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 \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 4773c6826620..b8e18d763c1f 100644
--- 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 \
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 3d6462513857..9d5748ede637 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/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 ac2c245a3d61..4ec9dccd3113 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/DevelopmentToolChildWindow.hxx>
+#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <memory>
generated by cgit (git 2.34.1) at 2024-08-02 16:57:25 +0000