sfx2/inc/DevelopmentToolDockingWindow.hxx | 6 +++---
sfx2/inc/pch/precompiled_sfx.hxx | 1 -
sfx2/source/appl/appserv.cxx | 2 +-
sfx2/source/devtools/DevelopmentToolChildWindow.cxx | 2 +-
sfx2/source/devtools/DevelopmentToolDockingWindow.cxx | 2 +-
sfx2/source/devtools/SelectionChangeHandler.hxx | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit e2cacf0456f79540ced611be84504d11b94ebe6f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 23 13:02:41 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Feb 24 10:13:19 2024 +0100
move this header inside the module
it is not used anywhere else
Change-Id: I46cc42397cf56237818e6e58268a856e826a9985
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163818
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
b/sfx2/inc/DevelopmentToolDockingWindow.hxx
similarity index 90%
rename from include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
rename to sfx2/inc/DevelopmentToolDockingWindow.hxx
index 9cd1efeb352e..18511f70b9b6 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/sfx2/inc/DevelopmentToolDockingWindow.hxx
@@ -28,7 +28,7 @@
* Contains two sides. Left side contains the simplified DOM tree and
* the right side the object inspector tree.
*/
-class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) DevelopmentToolDockingWindow final :
public SfxDockingWindow
+class DevelopmentToolDockingWindow final : public SfxDockingWindow
{
private:
std::unique_ptr<ObjectInspectorWidgets> mpObjectInspectorWidgets;
@@ -47,8 +47,8 @@ private:
// Handler for the object inspector tree
ObjectInspectorTreeHandler maObjectInspectorTreeHandler;
- DECL_DLLPRIVATE_LINK(DocumentModelTreeViewSelectionHandler,
weld::TreeView&, void);
- DECL_DLLPRIVATE_LINK(DomToolbarButtonClicked, const OUString&, void);
+ DECL_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void);
+ DECL_LINK(DomToolbarButtonClicked, const OUString&, void);
void updateSelection();
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 1f92a21a34ea..97de88104b0b 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -411,7 +411,6 @@
#include <sfx2/childwin.hxx>
#include <sfx2/classificationhelper.hxx>
#include <sfx2/ctrlitem.hxx>
-#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/dllapi.h>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d3884203596a..ed114b0d31a7 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -98,7 +98,7 @@
#include <sfx2/sidebar/SidebarController.hxx>
#include <sfx2/safemode.hxx>
#include <sfx2/sfxuno.hxx>
-#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
+#include <DevelopmentToolDockingWindow.hxx>
#include <comphelper/types.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
b/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
index 6b160bfa092a..291c476247ac 100644
--- a/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
+++ b/sfx2/source/devtools/DevelopmentToolChildWindow.cxx
@@ -9,7 +9,7 @@
*/
#include <sfx2/devtools/DevelopmentToolChildWindow.hxx>
-#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
+#include <DevelopmentToolDockingWindow.hxx>
#include <sfx2/sfxsids.hrc>
SFX_IMPL_DOCKINGWINDOW_WITHID(DevelopmentToolChildWindow,
SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW);
diff --git a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
index 0095e3396cf8..4e3107a71ced 100644
--- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -10,7 +10,7 @@
#include <memory>
-#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
+#include <DevelopmentToolDockingWindow.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sfx2/source/devtools/SelectionChangeHandler.hxx
b/sfx2/source/devtools/SelectionChangeHandler.hxx
index 57224e056a52..f7c3afdf9c87 100644
--- a/sfx2/source/devtools/SelectionChangeHandler.hxx
+++ b/sfx2/source/devtools/SelectionChangeHandler.hxx
@@ -10,7 +10,7 @@
#pragma once
-#include <sfx2/devtools/DevelopmentToolDockingWindow.hxx>
+#include <DevelopmentToolDockingWindow.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
