diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-02-08 17:11:17 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-02-11 12:54:10 +0100 |
commit | a1ca311061b617b2e4731f6e4c8a5466e8a080f5 (patch) | |
tree | 7072b3b6c5fa15df4c79a05bcb70ec7270391411 /sd | |
parent | 9afdfc80a39f85b440bf753daa52832532ee1e8c (diff) |
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>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 5 | ||||
-rw-r--r-- | sd/source/ui/app/sddll.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drvwshrg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 |
5 files changed, 7 insertions, 6 deletions
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> |