diff options
44 files changed, 71 insertions, 62 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 69d6de815c28..d98569719749 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -28,6 +28,7 @@ #include <basslots.hxx> #include <sfx2/sfxmodelfactory.hxx> #include <svx/svxids.hrc> +#include <tools/globname.hxx> namespace basctl { diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 1166959499cd..1cac58176341 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -32,6 +32,7 @@ #include <svx/svdoutl.hxx> #include <svx/svxids.hrc> #include <svx/unoshape.hxx> +#include <tools/globname.hxx> #include <editeng/fhgtitem.hxx> #include <com/sun/star/container/XChild.hpp> diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index eccd83cc0d46..4fc2e214fd69 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -28,8 +28,8 @@ #include <vcl/group.hxx> #include <vcl/lstbox.hxx> #include <vcl/msgbox.hxx> +#include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <sot/stg.hxx> #include <svtools/sores.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/include/sot/object.hxx b/include/sot/object.hxx index f2c3b24490f6..b6328efa681b 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -20,11 +20,13 @@ #ifndef INCLUDED_SOT_OBJECT_HXX #define INCLUDED_SOT_OBJECT_HXX -#include <sot/sotdata.hxx> -#include <tools/globname.hxx> +#include <sal/config.h> + #include <tools/ref.hxx> #include <sot/sotdllapi.h> +class SotFactory; + class SOT_DLLPUBLIC SotObject : virtual public SvRefBase { friend class SotFactory; @@ -35,13 +37,10 @@ friend class SotFactory; protected: virtual ~SotObject(); virtual bool Close(); + public: SotObject(); -private: - static SotFactory ** GetFactoryAdress() - { return &(SOTDATA()->pSotObjectFactory); } -public: static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ); @@ -58,6 +57,6 @@ private: SotObject( const SotObject & ) = delete; }; -#endif // _IFACE_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index b51afe43e6e6..de6e0c7c27e3 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -26,12 +26,12 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <sot/object.hxx> -#include <sot/factory.hxx> #include <tools/stream.hxx> #include <tools/errcode.hxx> #include <sot/storinfo.hxx> #include <sot/sotdllapi.h> +class SotFactory; class SotStorage; enum class SotClipboardFormatId : sal_uLong; @@ -56,10 +56,6 @@ public: SotStorageStream( BaseStorageStream *pStm ); SotStorageStream(); -private: - static SotFactory ** GetFactoryAdress() - { return &(SOTDATA()->pSotStorageStreamFactory); } -public: static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ) override; @@ -108,10 +104,6 @@ public: SotStorage( SvStream * pStm, bool bDelete ); SotStorage(); -private: - static SotFactory ** GetFactoryAdress() - { return &(SOTDATA()->pSotStorageFactory); } -public: static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ) override; diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index f5a09a4b94ce..c6baa5c79bea 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -33,6 +33,7 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/globname.hxx> #include <svx/charthelper.hxx> #include <svtools/embedhlp.hxx> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index e467a2fda4dc..9d735c4d4251 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/object.hxx> +#include <sal/config.h> + #include <editeng/eeitem.hxx> #include <vcl/waitobj.hxx> - #include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdoole2.hxx> @@ -36,7 +36,6 @@ #include <svx/svxids.hrc> #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> - #include <sfx2/viewfrm.hxx> #include "anminfo.hxx" diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index b7819f3efc4a..dadab28996ce 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> +#include <tools/globname.hxx> #include <tools/urlobj.hxx> #include <svtools/imagemgr.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 953369d86ea3..db7bd7f6b76f 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -49,6 +49,7 @@ #include "doc.hrc" #include <rtl/strbuf.hxx> +#include <tools/globname.hxx> #include <assert.h> diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index f6ad2b4ca076..e40fd8952f42 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <sot/object.hxx> #include <tools/stream.hxx> #include <vcl/splitwin.hxx> #include <svl/itemset.hxx> diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 1e5a4f5459d8..88760eac5e0d 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -22,6 +22,8 @@ #include <sfx2/objitem.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <tools/globname.hxx> + SfxPoolItem* SfxObjectShellItem::CreateDefault() { return new SfxObjectShellItem; } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 5d1bf3e782c2..3bdb6f74aa07 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -70,6 +70,7 @@ #include <unotools/ucbhelper.hxx> #include <svtools/asynclink.hxx> #include <tools/diagnose_ex.h> +#include <tools/globname.hxx> #include <comphelper/classids.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index fbff13da869b..8cb5fff8774d 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <sfx2/objsh.hxx> +#include <tools/globname.hxx> using namespace css; diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 39593395f85a..d1768dd91517 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -38,6 +38,7 @@ #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <osl/thread.hxx> +#include <tools/globname.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index dc3b36f6da6c..e1452ece8498 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> -#include <sot/factory.hxx> #include <svtools/menuoptions.hxx> #include <svtools/imagemgr.hxx> #include <svl/imageitm.hxx> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 4b3b9c042f4f..d8816c4c670d 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -46,6 +46,7 @@ #include <svl/intitem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> +#include <tools/globname.hxx> #include <ctrlfactoryimpl.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 3a8062786190..35daecffe9db 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -66,6 +66,7 @@ #include <framework/sfxhelperfunctions.hxx> #include <vcl/taskpanelist.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/globname.hxx> #include <svtools/menuoptions.hxx> #include <svtools/miscopt.hxx> diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index ee08b52c1058..ffebf56ccfff 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -33,6 +33,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/globname.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> diff --git a/include/sot/factory.hxx b/sot/inc/factory.hxx index 3fe2fcad0954..ab22cc08cadb 100644 --- a/include/sot/factory.hxx +++ b/sot/inc/factory.hxx @@ -20,20 +20,13 @@ #ifndef INCLUDED_SOT_FACTORY_HXX #define INCLUDED_SOT_FACTORY_HXX +#include <sal/config.h> + #include <tools/globname.hxx> -#include <sot/sotdllapi.h> -#include <vector> -/************************************************************************* -*************************************************************************/ class SotObject; -class SotFactory; - -typedef ::std::vector< SotFactory* > SotFactoryList; -typedef void * (*CreateInstanceType)( SotObject ** ); -//==================class SotFactory======================================= -class SOT_DLLPUBLIC SotFactory : public SvGlobalName +class SotFactory : public SvGlobalName { sal_uInt16 nSuperCount; // Anzahl der Superklassen const SotFactory ** pSuperClasses; // Superklassen @@ -59,6 +52,6 @@ private: SotFactory & operator = ( const SotFactory & ) = delete; }; -#endif // _FACTORY_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/sotdata.hxx b/sot/inc/sotdata.hxx index 58867b0b0cd7..f2d3c260bf84 100644 --- a/include/sot/sotdata.hxx +++ b/sot/inc/sotdata.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_SOT_SOTDATA_HXX #define INCLUDED_SOT_SOTDATA_HXX -#include <sot/sotdllapi.h> +#include <sal/config.h> + #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <vector> #include <list> @@ -45,7 +46,7 @@ struct SotData_Impl ~SotData_Impl(); }; -SOT_DLLPUBLIC SotData_Impl* SOTDATA(); +SotData_Impl* SOTDATA(); #endif diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 13ca02f52cc2..c50a6b77e46c 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -17,10 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <tools/debug.hxx> #include <tools/solar.h> #include <tools/globname.hxx> -#include <sot/sotdata.hxx> +#include <sotdata.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sysformats.hxx> @@ -29,10 +31,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/documentconstants.hxx> -#ifdef GetObject -#undef GetObject -#endif - using namespace::com::sun::star::uno; using namespace::com::sun::star::datatransfer; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 8111c2bc3f38..74946ad68821 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/factory.hxx> +#include <factory.hxx> + #include <tools/debug.hxx> #include <sot/object.hxx> -#include <sot/sotdata.hxx> +#include <sotdata.hxx> #include <comphelper/classids.hxx> #include <osl/diagnose.h> #include <rtl/instance.hxx> diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 11802528f2c2..25b198d0a2c4 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -18,7 +18,8 @@ */ #include <sot/object.hxx> -#include <sot/factory.hxx> +#include <factory.hxx> +#include <sotdata.hxx> /************** class SotObject ******************************************/ class SotObjectFactory : public SotFactory @@ -32,7 +33,7 @@ public: SotFactory * SotObject::ClassFactory() { - SotFactory **ppFactory = GetFactoryAdress(); + SotFactory **ppFactory = &(SOTDATA()->pSotObjectFactory); if( !*ppFactory ) { *ppFactory = new SotObjectFactory( diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index df13786b3158..63c8cbdb5463 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <sal/config.h> + #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -35,6 +35,10 @@ #include <tools/urlobj.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/processfactory.hxx> + +#include <factory.hxx> +#include <sotdata.hxx> + #include <memory> using namespace ::com::sun::star; @@ -51,7 +55,7 @@ public: SotFactory * SotStorageStream::ClassFactory() { - SotFactory **ppFactory = GetFactoryAdress(); + SotFactory **ppFactory = &(SOTDATA()->pSotStorageStreamFactory); if( !*ppFactory ) { *ppFactory = new SotStorageStreamFactory( @@ -300,7 +304,7 @@ public: SotFactory * SotStorage::ClassFactory() { - SotFactory **ppFactory = GetFactoryAdress(); + SotFactory **ppFactory = &(SOTDATA()->pSotStorageFactory); if( !*ppFactory ) { *ppFactory = new SotStorageFactory( diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index baa974ddc3ce..738a6c51abbc 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/factory.hxx> +#include <sal/config.h> + #include <svx/svxids.hrc> #include <svx/modctrl.hxx> #include <svx/zoomctrl.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 33cb2ccb8e24..26099ab883b0 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <vcl/wrkwin.hxx> -#include <sot/factory.hxx> #include <tools/helpers.hxx> #include <vcl/msgbox.hxx> #include <svl/eitem.hxx> diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 7376b8e8172e..6fbab3e9b2e2 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -49,6 +49,7 @@ #include <svx/lathe3d.hxx> #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> +#include <tools/globname.hxx> using namespace ::cppu; using namespace ::com::sun::star; diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index e445b0954c26..1c4c012f41c0 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/factory.hxx> +#include <sal/config.h> + #include <tools/poly.hxx> #include <vcl/bmpacc.hxx> #include <vcl/virdev.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 46b41de4b077..a8fd3bd03280 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -507,7 +507,6 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sot/object.hxx> -#include <sot/sotdata.hxx> #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/cenumitm.hxx> diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 962c69200f1f..58d28b238ee9 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -71,6 +71,7 @@ #include <svl/itemiter.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> +#include <tools/globname.hxx> #include <editeng/formatbreakitem.hxx> #include <com/sun/star/i18n/Boundary.hpp> #include <memory> diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 98e34c39b242..ebd8cc312f99 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -25,6 +25,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> +#include <tools/globname.hxx> #include <fmtfsize.hxx> #include <fmthdft.hxx> #include <fmtcntnt.hxx> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 1ddc0cad9558..afc95d7fb8a4 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -72,6 +72,7 @@ #include <ToxTextGenerator.hxx> #include <ToxTabStopTokenHandler.hxx> #include <tools/datetimeutils.hxx> +#include <tools/globname.hxx> #include <memory> diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index ad6f7df0764e..eb05f95adb54 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -23,6 +23,7 @@ #include <svx/fmmodel.hxx> #include <sot/exchange.hxx> #include <svx/sdrundomanager.hxx> +#include <tools/globname.hxx> #include <editeng/outliner.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index d06b788c13df..f9db811c8cb9 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -25,6 +25,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdouno.hxx> #include <svx/fmglob.hxx> +#include <tools/globname.hxx> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <fmtanchr.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 4526f4e850ff..e55d8cd60971 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -36,6 +36,7 @@ #include <editeng/protitem.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> +#include <tools/globname.hxx> #include <IDocumentSettingAccess.hxx> #include <DocumentSettingManager.hxx> #include <IDocumentState.hxx> diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 5db900b62b36..f17714c7b720 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -31,6 +31,7 @@ #include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/globname.hxx> #include <hintids.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 19a0f777f8bb..e42b6dc559af 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <hintids.hxx> -#include <sot/factory.hxx> #include <editeng/xmlcnitm.hxx> #include <svl/whiter.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index b7b6cc0784a2..98bd0ae546b2 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -34,6 +34,7 @@ #include <svx/xflgrit.hxx> #include <svx/sdtaitm.hxx> #include <svx/xflclit.hxx> +#include <tools/globname.hxx> #include <editeng/memberids.hrc> #include <swtypes.hxx> #include <cmdid.h> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 93ede702cb09..fd92482373c6 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -37,8 +37,8 @@ #include <editeng/frmdiritem.hxx> #include <svx/swframevalidation.hxx> #include <comphelper/classids.hxx> - #include <sfx2/viewfrm.hxx> +#include <tools/globname.hxx> #include <fmturl.hxx> #include <fmteiro.hxx> #include <fmtcnct.hxx> diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 2c609e186b11..65785150f0a3 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sot/factory.hxx> +#include <sal/config.h> + #include <hintids.hxx> #include <svl/urihelper.hxx> #include <svl/languageoptions.hxx> diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index f47ffbc81a43..b44a2c006169 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -30,12 +30,11 @@ #include <math.h> #include <hintids.hxx> +#include <sot/exchange.hxx> #include <svx/hdft.hxx> #include <svx/svdview.hxx> -#include <sot/factory.hxx> #include <svl/itemiter.hxx> #include <tools/bigint.hxx> -#include <sot/storage.hxx> #include <svtools/insdlg.hxx> #include <sfx2/frmdescr.hxx> #include <sfx2/ipclient.hxx> diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 633d06daf37a..341e1ee751f2 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -300,7 +300,6 @@ #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> #include <sot/object.hxx> -#include <sot/sotdata.hxx> #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index adc4626950a1..3e7c1f0ccf0a 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -18,8 +18,6 @@ */ #include <comphelper/string.hxx> -#include <sot/object.hxx> -#include <sot/factory.hxx> #include <tools/debug.hxx> #include <tools/bigint.hxx> diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index f8ae32e385bb..dc8074fb6e91 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_WINMTF_HXX #define INCLUDED_VCL_SOURCE_FILTER_WMF_WINMTF_HXX -#include <sot/object.hxx> +#include <sal/config.h> + #include <vcl/graph.hxx> #include <basegfx/tools/b2dclipstate.hxx> #include <vcl/font.hxx> |