solenv/clang-format/excludelist | 3 +--
toolkit/inc/helper/property.hxx | 4 +---
toolkit/source/awt/animatedimagespeer.cxx | 2 +-
toolkit/source/awt/vclxcontainer.cxx | 2 +-
toolkit/source/awt/vclxspinbutton.cxx | 2 +-
toolkit/source/awt/vclxtabpagecontainer.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/awt/vclxwindow.cxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
toolkit/source/controls/animatedimages.cxx | 2 +-
toolkit/source/controls/controlmodelcontainerbase.cxx | 2 +-
toolkit/source/controls/dialogcontrol.cxx | 2 +-
toolkit/source/controls/formattedcontrol.cxx | 2 +-
toolkit/source/controls/geometrycontrolmodel.cxx | 2 +-
toolkit/source/controls/grid/gridcontrol.cxx | 2 +-
toolkit/source/controls/roadmapcontrol.cxx | 2 +-
toolkit/source/controls/svtxgridcontrol.cxx | 2 +-
toolkit/source/controls/tabpagecontainer.cxx | 2 +-
toolkit/source/controls/tabpagemodel.cxx | 2 +-
toolkit/source/controls/tkscrollbar.cxx | 2 +-
toolkit/source/controls/tkspinbutton.cxx | 2 +-
toolkit/source/controls/tree/treecontrol.cxx | 2 +-
toolkit/source/controls/tree/treecontrolpeer.cxx | 2 +-
toolkit/source/controls/unocontrol.cxx | 2 +-
toolkit/source/controls/unocontrolbase.cxx | 2 +-
toolkit/source/controls/unocontrolcontainermodel.cxx | 2 +-
toolkit/source/controls/unocontrolmodel.cxx | 2 +-
toolkit/source/controls/unocontrols.cxx | 2 +-
toolkit/source/helper/property.cxx | 2 +-
toolkit/source/helper/unopropertyarrayhelper.cxx | 2 +-
30 files changed, 30 insertions(+), 33 deletions(-)
New commits:
commit cd52832249267a83f7207e6702a50af6e94c6654
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 9 09:03:35 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 9 18:12:21 2023 +0200
move a toolkit header inside the module
It is only used inside the module, no need to be public
Change-Id: Ibd8445ecbb67624569ee7225f0bdf6d9c041dab4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151569
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index b0437ef47617..3453747854d3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5270,7 +5270,6 @@ include/framework/desktop.hxx
include/framework/documentundoguard.hxx
include/framework/framecontainer.hxx
include/framework/framelistanalyzer.hxx
-include/framework/gate.hxx
include/framework/generictoolbarcontroller.hxx
include/framework/imutex.hxx
include/framework/sfxhelperfunctions.hxx
@@ -6107,7 +6106,6 @@ include/toolkit/helper/accessiblefactory.hxx
include/toolkit/helper/convert.hxx
include/toolkit/helper/listenermultiplexer.hxx
include/toolkit/helper/macros.hxx
-include/toolkit/helper/property.hxx
include/toolkit/helper/vclunohelper.hxx
include/tools/b3dtrans.hxx
include/tools/bigint.hxx
@@ -13563,6 +13561,7 @@ toolkit/inc/controls/unocontrolcontainermodel.hxx
toolkit/inc/helper/accessibilityclient.hxx
toolkit/inc/helper/btndlg.hxx
toolkit/inc/helper/imagealign.hxx
+toolkit/inc/helper/property.hxx
toolkit/inc/helper/scrollabledialog.hxx
toolkit/inc/helper/unopropertyarrayhelper.hxx
toolkit/inc/helper/unowrapper.hxx
diff --git a/include/toolkit/helper/property.hxx
b/toolkit/inc/helper/property.hxx
similarity index 99%
rename from include/toolkit/helper/property.hxx
rename to toolkit/inc/helper/property.hxx
index e082433dd364..013f73496482 100644
--- a/include/toolkit/helper/property.hxx
+++ b/toolkit/inc/helper/property.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
#define INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
-#include <toolkit/dllapi.h>
-
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -234,7 +232,7 @@ namespace com::sun::star::uno {
#define PROPERTY_ALIGN_RIGHT 2
-TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const OUString&
rPropertyName );
+sal_uInt16 GetPropertyId( const OUString& rPropertyName );
const css::uno::Type* GetPropertyType( sal_uInt16 nPropertyId );
const OUString& GetPropertyName( sal_uInt16 nPropertyId );
sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId
);
diff --git a/toolkit/source/awt/animatedimagespeer.cxx
b/toolkit/source/awt/animatedimagespeer.cxx
index adb89c2c962b..ac2dca5603be 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -19,7 +19,7 @@
#include <awt/animatedimagespeer.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
diff --git a/toolkit/source/awt/vclxcontainer.cxx
b/toolkit/source/awt/vclxcontainer.cxx
index 954655397853..de7518d418c9 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -26,7 +26,7 @@
#include <vcl/tabpage.hxx>
#include <tools/debug.hxx>
#include <helper/scrollabledialog.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
diff --git a/toolkit/source/awt/vclxspinbutton.cxx
b/toolkit/source/awt/vclxspinbutton.cxx
index db5d1f1b05f4..cc4747dc20f4 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -18,7 +18,7 @@
*/
#include <awt/vclxspinbutton.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
#include <vcl/toolkit/spin.hxx>
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 18e12cdab488..55a27ba2af27 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/awt/XControl.hpp>
#include <o3tl/safeint.hxx>
#include <sal/log.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <vcl/image.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 476bcf71da5c..c8e918c2cea3 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -85,7 +85,7 @@
#include <awt/animatedimagespeer.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/helper/convert.hxx>
#include <controls/filectrl.hxx>
diff --git a/toolkit/source/awt/vclxwindow.cxx
b/toolkit/source/awt/vclxwindow.cxx
index 1c7dcf5990b1..930d8fe4eaee 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -37,7 +37,7 @@
#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/helper/convert.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
#include <utility>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index abe8c9057b00..ef378f228895 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/helper/convert.hxx>
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/toolkit/source/controls/animatedimages.cxx
b/toolkit/source/controls/animatedimages.cxx
index 5d8267998496..dec4a8c5330c 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -19,7 +19,7 @@
#include <controls/animatedimages.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index bec15994a034..14933e96affc 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -22,7 +22,7 @@
#include <vcl/svapp.hxx>
#include <o3tl/safeint.hxx>
#include <osl/mutex.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <helper/servicenames.hxx>
#include <controls/geometrycontrolmodel.hxx>
#include <toolkit/controls/unocontrols.hxx>
diff --git a/toolkit/source/controls/dialogcontrol.cxx
b/toolkit/source/controls/dialogcontrol.cxx
index dffc0111b6ef..940e60691468 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -25,7 +25,7 @@
#include <vcl/svapp.hxx>
#include <controls/dialogcontrol.hxx>
#include <controls/geometrycontrolmodel.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <helper/servicenames.hxx>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/toolkit/source/controls/formattedcontrol.cxx
b/toolkit/source/controls/formattedcontrol.cxx
index 13ef8886cc4f..cf3094c35857 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -18,7 +18,7 @@
*/
#include <controls/formattedcontrol.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx
b/toolkit/source/controls/geometrycontrolmodel.cxx
index 41dec5b57e14..646e4e58be3a 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -23,7 +23,7 @@
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
#include <controls/eventcontainer.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <algorithm>
#include <functional>
#include <utility>
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx
b/toolkit/source/controls/grid/gridcontrol.cxx
index d6071046afc8..0fb9e9695958 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/awt/grid/DefaultGridDataModel.hpp>
#include <com/sun/star/awt/grid/SortableGridDataModel.hpp>
#include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
diff --git a/toolkit/source/controls/roadmapcontrol.cxx
b/toolkit/source/controls/roadmapcontrol.cxx
index 84d49a78f48b..1fdef79f28b7 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -20,7 +20,7 @@
#include <controls/roadmapcontrol.hxx>
#include <controls/roadmapentry.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/svtxgridcontrol.cxx
b/toolkit/source/controls/svtxgridcontrol.cxx
index f3eaf73d3de7..0180231f92da 100644
--- a/toolkit/source/controls/svtxgridcontrol.cxx
+++ b/toolkit/source/controls/svtxgridcontrol.cxx
@@ -27,7 +27,7 @@
#include "unocontroltablemodel.hxx"
#include <sal/log.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/grid/XGridColumn.hpp>
#include <com/sun/star/awt/grid/GridInvalidDataException.hpp>
#include <com/sun/star/awt/grid/GridInvalidModelException.hpp>
diff --git a/toolkit/source/controls/tabpagecontainer.cxx
b/toolkit/source/controls/tabpagecontainer.cxx
index 82c24fdb0681..509c2f12d248 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -21,7 +21,7 @@
#include <controls/geometrycontrolmodel.hxx>
#include <controls/tabpagecontainer.hxx>
#include <controls/tabpagemodel.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/toolkit/source/controls/tabpagemodel.cxx
b/toolkit/source/controls/tabpagemodel.cxx
index 355f794197bc..ac57abdc2da3 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -20,7 +20,7 @@
#include <controls/tabpagemodel.hxx>
#include <vcl/svapp.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/awt/UnoControlDialogModelProvider.hpp>
#include <com/sun/star/awt/tab/XTabPage.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/toolkit/source/controls/tkscrollbar.cxx
b/toolkit/source/controls/tkscrollbar.cxx
index 48a2a560b5a6..5a32214454b2 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -18,7 +18,7 @@
*/
#include <controls/tkscrollbar.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/toolkit/source/controls/tkspinbutton.cxx
b/toolkit/source/controls/tkspinbutton.cxx
index 9b106ed3a5d6..59dad491c59b 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -26,7 +26,7 @@
#include <cppuhelper/implbase2.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/controls/unocontrolbase.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <helper/unopropertyarrayhelper.hxx>
diff --git a/toolkit/source/controls/tree/treecontrol.cxx
b/toolkit/source/controls/tree/treecontrol.cxx
index 3fd06588d3d8..59ece9ee4b63 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/view/SelectionType.hpp>
#include <toolkit/controls/unocontrolbase.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <osl/diagnose.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx
b/toolkit/source/controls/tree/treecontrolpeer.cxx
index fe273e0f6baf..9dd5c83a1503 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/view/SelectionType.hpp>
#include <com/sun/star/util/VetoException.hpp>
#include <o3tl/any.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/awt/tree/XMutableTreeNode.hpp>
diff --git a/toolkit/source/controls/unocontrol.cxx
b/toolkit/source/controls/unocontrol.cxx
index 5401cf86d7b7..c47048b3a4b6 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -36,7 +36,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <controls/accessiblecontrolcontext.hxx>
diff --git a/toolkit/source/controls/unocontrolbase.cxx
b/toolkit/source/controls/unocontrolbase.cxx
index 69cfbac5de66..134e7b181b38 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <toolkit/controls/unocontrolbase.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <tools/debug.hxx>
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx
b/toolkit/source/controls/unocontrolcontainermodel.cxx
index ffcd520a4992..6bfaf4448cd1 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <controls/unocontrolcontainermodel.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <helper/unopropertyarrayhelper.hxx>
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index 4aaf9908ade9..edd79e687640 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -36,7 +36,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <tools/debug.hxx>
#include <tools/long.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/helper/emptyfontdescriptor.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/configmgr.hxx>
diff --git a/toolkit/source/controls/unocontrols.cxx
b/toolkit/source/controls/unocontrols.cxx
index c8a3f8c839a3..7ce4b471c80c 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -31,7 +31,7 @@
#include <o3tl/safeint.hxx>
#include <controls/formattedcontrol.hxx>
#include <toolkit/controls/unocontrols.hxx>
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <toolkit/helper/macros.hxx>
// for introspection
diff --git a/toolkit/source/helper/property.cxx
b/toolkit/source/helper/property.cxx
index 315f0ef5d897..945c4b016a64 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <tools/debug.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx
b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 0b4b8055c226..bc0f996d3d37 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -18,7 +18,7 @@
*/
-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
#include <map>
#include <helper/unopropertyarrayhelper.hxx>
