From e22352dcaf9f8501f4d9a632b43d4ff17bd2534d Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu, 15 Jan 2026 11:07:38 +0100
Subject: [PATCH] framework: Move layoutmanager.hxx to top-level include/

Move the so far framework-internal headers layoutmanager.hxx
and the uielement.hxx one that it includes to the
top-level include/ directory and mark LayoutManager as
FWK_DLLPUBLIC.

This is to prepare for a new version of Heiko's [1]
that doesn't require UNO API changes, but can use
the LayoutManager class directly.

[1] https://gerrit.libreoffice.org/c/core/+/195836/9

Change-Id: I7439274c29814ef23c6fde11770e1519e54bc0b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197338
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
---
 framework/source/layoutmanager/layoutmanager.cxx     |  2 +-
 .../source/layoutmanager/toolbarlayoutmanager.cxx    |  2 +-
 .../source/layoutmanager/toolbarlayoutmanager.hxx    |  4 ++--
 framework/source/layoutmanager/uielement.cxx         |  3 +--
 .../services => include/framework}/layoutmanager.hxx | 12 ++++++------
 .../uielement => include/framework}/uielement.hxx    |  0
 solenv/clang-format/excludelist                      |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)
 rename {framework/inc/services => include/framework}/layoutmanager.hxx (97%)
 rename {framework/inc/uielement => include/framework}/uielement.hxx (100%)

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 8c47b21a8480..c28d40e8f079 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -21,7 +21,6 @@
 #include <config_feature_desktop.h>
 
 #include <properties.h>
-#include <services/layoutmanager.hxx>
 #include "helpers.hxx"
 
 #include <framework/sfxhelperfunctions.hxx>
@@ -52,6 +51,7 @@
 
 #include <comphelper/lok.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <framework/layoutmanager.hxx>
 #include <vcl/status.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclevent.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index b159b195ba2e..22f7ce12057d 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -21,7 +21,6 @@
 #include <uiconfiguration/windowstateproperties.hxx>
 #include <uielement/addonstoolbarwrapper.hxx>
 #include "helpers.hxx"
-#include <services/layoutmanager.hxx>
 #include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
@@ -35,6 +34,7 @@
 
 #include <comphelper/propertyvalue.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <framework/layoutmanager.hxx>
 #include <o3tl/string_view.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index f892b3af816d..b37908f6087b 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -26,8 +26,8 @@
 
 #include <uiconfiguration/globalsettings.hxx>
 #include <framework/addonsoptions.hxx>
-#include <uielement/uielement.hxx>
-#include <services/layoutmanager.hxx>
+#include <framework/layoutmanager.hxx>
+#include <framework/uielement.hxx>
 
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx
index 58218751528d..c08d32042ef1 100644
--- a/framework/source/layoutmanager/uielement.cxx
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -17,9 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <uielement/uielement.hxx>
-
 #include <com/sun/star/ui/DockingArea.hpp>
+#include <framework/uielement.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/framework/inc/services/layoutmanager.hxx b/include/framework/layoutmanager.hxx
similarity index 97%
rename from framework/inc/services/layoutmanager.hxx
rename to include/framework/layoutmanager.hxx
index 06df41c4523c..41a08717125a 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/include/framework/layoutmanager.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <uielement/uielement.hxx>
-
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XLayoutManager2.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
@@ -39,6 +37,8 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/uno3.hxx>
+#include <framework/fwkdllapi.h>
+#include <framework/uielement.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/vclevent.hxx>
@@ -59,10 +59,10 @@ typedef ::cppu::WeakImplHelper<css::lang::XServiceInfo, css::frame::XLayoutManag
     LayoutManager_Base;
 typedef ::comphelper::OPropertyContainer LayoutManager_PBase;
 
-class LayoutManager final : public LayoutManager_Base,
-                            private cppu::BaseMutex,
-                            public ::cppu::OBroadcastHelper,
-                            public LayoutManager_PBase
+class FWK_DLLPUBLIC LayoutManager final : public LayoutManager_Base,
+                                          private cppu::BaseMutex,
+                                          public ::cppu::OBroadcastHelper,
+                                          public LayoutManager_PBase
 {
 public:
     LayoutManager(const css::uno::Reference<css::uno::XComponentContext>& xContext);
diff --git a/framework/inc/uielement/uielement.hxx b/include/framework/uielement.hxx
similarity index 100%
rename from framework/inc/uielement/uielement.hxx
rename to include/framework/uielement.hxx
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index e985ad473a92..d096fc075682 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -4128,7 +4128,6 @@ framework/inc/uielement/toolbarmodemenucontroller.hxx
 framework/inc/uielement/toolbarsmenucontroller.hxx
 framework/inc/uielement/toolbarwrapper.hxx
 framework/inc/uielement/uicommanddescription.hxx
-framework/inc/uielement/uielement.hxx
 framework/inc/uielement/uielementtypenames.hxx
 framework/inc/uifactory/configurationaccessfactorymanager.hxx
 framework/inc/uifactory/factoryconfiguration.hxx
@@ -5065,6 +5064,7 @@ include/framework/imutex.hxx
 include/framework/sfxhelperfunctions.hxx
 include/framework/titlehelper.hxx
 include/framework/transactionmanager.hxx
+include/framework/uielement.hxx
 include/framework/undomanagerhelper.hxx
 include/helpcompiler/HelpIndexer.hxx
 include/helpcompiler/HelpSearch.hxx