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.grandin@collabora.co.uk>
2023-05-09 18:12:21 +02:00
parent 4f520dc7e3
commit cd52832249
30 changed files with 30 additions and 33 deletions
@@ -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
@@ -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 );
@@ -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>
@@ -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 )
 {
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>

@@ -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>
@@ -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>

@@ -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>

@@ -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>

@@ -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>
@@ -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
@@ -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>
@@ -18,7 +18,7 @@
 */


-#include <toolkit/helper/property.hxx>
+#include <helper/property.hxx>
 #include <map>

 #include <helper/unopropertyarrayhelper.hxx>