diff options
Diffstat (limited to 'sfx2/source')
45 files changed, 1 insertions, 116 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 174dccd61ee3..a67bef7505cb 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -36,13 +36,8 @@ #include <unotools/configmgr.hxx> #include <unotools/tempfile.hxx> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameActionEvent.hpp> -#include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index b092a13fb1f8..1610510eb3d1 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -24,7 +24,6 @@ #include <cassert> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <basic/basrdll.hxx> #include <officecfg/Office/Common.hxx> @@ -81,7 +80,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::script; using ::basic::BasicManagerRepository; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 30df815ce39d..7585bbe44fb5 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -76,7 +75,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 3cbe80461695..280319e3cddb 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -31,15 +31,12 @@ #include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/graphic/Primitive2DTools.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/uno/Reference.h> #include <tools/rcid.h> #include <osl/mutex.hxx> #include <unotools/configmgr.hxx> -#include <com/sun/star/frame/XDesktop.hpp> #include <unotools/ucbstreamhelper.hxx> #include <framework/menuconfiguration.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 6d9f275f80bc..021aefcb0e6c 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -20,14 +20,10 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/DispatchResultState.hpp> -#include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 76813e193e46..0eddae83f90d 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> @@ -48,8 +46,6 @@ #include <com/sun/star/util/CloseVetoException.hpp> #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> - #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/propertysequence.hxx> diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 5dc15bb75a98..226b16e56a16 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -22,7 +22,6 @@ #include <tools/rcid.h> #include <unotools/moduleoptions.hxx> #include <unotools/viewoptions.hxx> -#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 9a631f90e6ab..809078add4d0 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -22,7 +22,6 @@ #include <sfx2/sfxuno.hxx> #include "newhelp.hxx" #include <tools/debug.hxx> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 4e97836a0e6b..4e3db51d4125 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -25,7 +25,6 @@ #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <cppuhelper/interfacecontainer.h> #include <vcl/window.hxx> #include <limits.h> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8754f1697a8b..96e54561145c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -50,11 +50,9 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/WordType.hpp> diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 74de410b71e3..e6cb4b7aa93a 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -20,8 +20,6 @@ #define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/frame/XDispatchResultListener.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XFrame2.hpp> #include <vcl/window.hxx> diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index a1005ba227f1..85b4b8d3e39a 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -25,17 +25,13 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> #include <com/sun/star/frame/XFrame2.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 8d02091f5c45..7496e6aa153f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 74cfe3f5a1ec..fa6b2ec7661b 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -47,23 +47,6 @@ #include <svl/rectitem.hxx> #include <sot/storage.hxx> -#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/frame/DispatchDescriptor.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameActionEvent.hpp> -#include <com/sun/star/frame/FrameAction.hpp> -#include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> -#include <com/sun/star/frame/XFilterDetect.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index fde677db50c1..7a0556b6cd79 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -46,7 +46,6 @@ #include <time.h> using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; struct SfxProgress_Impl diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index ecb950a30aba..012596c175b3 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -31,16 +31,9 @@ #include <svl/visitem.hxx> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/frame/DispatchDescriptor.hpp> -#include <com/sun/star/frame/XController.hpp> #include <comphelper/processfactory.hxx> #include "itemdel.hxx" @@ -63,8 +56,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/msgpool.hxx> -#include <com/sun/star/frame/XModuleManager.hpp> - #include <cstddef> #include <memory> #include <unordered_map> diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index d61e0e05e6aa..b38c697da431 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -28,8 +28,6 @@ #include <vcl/pngread.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/util/URLTransformer.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <templateview.hrc> #include "bitmaps.hlst" @@ -38,7 +36,6 @@ using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::beans; namespace { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 8465c33dfa85..4f1995ce6dae 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -24,12 +24,6 @@ #include <string> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameActionEvent.hpp> -#include <com/sun/star/frame/FrameAction.hpp> #include <framework/dispatchhelper.hxx> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 6c5881422b15..57acf992c8cb 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -28,9 +28,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -45,7 +43,6 @@ #define MNI_RENAME 5 using namespace ::com::sun::star; -using namespace ::com::sun::star::frame; bool ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION filter, const OUString &rExt) { diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 169c0344a216..9bbc97ffa0f2 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -34,12 +34,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameActionEvent.hpp> -#include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/ItemState.hpp> diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 31388537f55c..37dc5b9dcfeb 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDesktop2.hpp> #include <memory> #include <set> diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx index cd39387b1376..af81e39636c4 100644 --- a/sfx2/source/dialog/bluthsnd.cxx +++ b/sfx2/source/dialog/bluthsnd.cxx @@ -10,7 +10,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <stdio.h> diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 74522e290d4e..cdddb2b19be8 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -38,7 +38,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/msgpool.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 7b2a592db670..949b6e2679ea 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> - #include <svl/eitem.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index a3733619f5f7..cca1bee7cabe 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/document/DocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/io/IOException.hpp> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 36ac1f9faad1..44f779de7d00 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/document/DocumentProperties.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <comphelper/fileurl.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6b5374a694b0..5dbf2c272e8b 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -37,10 +37,6 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#include <com/sun/star/frame/DocumentTemplates.hpp> -#include <com/sun/star/frame/XController2.hpp> -#include <com/sun/star/frame/XDocumentTemplates.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <com/sun/star/security/CertificateValidity.hpp> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 5c0a26a900a7..ea77377f54b5 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -28,9 +28,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExporter.hpp> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index db889ac89788..44ae593893e2 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/IllegalArgumentIOException.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> -#include <com/sun/star/frame/UntitledNumbersConst.hpp> #include <com/sun/star/embed/XTransactionBroadcaster.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index d337fd325240..f4be8a17ae76 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 95ca7b5acf7e..d8ae9b33078f 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -28,7 +28,6 @@ #include <vcl/timer.hxx> #include <sfx2/app.hxx> #include <o3tl/enumarray.hxx> -#include <com/sun/star/frame/XModel.hpp> #include "bitset.hxx" #include <memory> diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 1eb32581546d..abc42ba77b30 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> -#include <com/sun/star/frame/XGlobalEventBroadcaster.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index ac2de9a9e3dc..bdb5036ed060 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_OBJSHIMP_HXX #define INCLUDED_SFX2_SOURCE_INC_OBJSHIMP_HXX -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index ab2b6ef89efc..a93f2813491b 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -19,14 +19,10 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_STATCACH_HXX #define INCLUDED_SFX2_SOURCE_INC_STATCACH_HXX -#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase.hxx> diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 58d31f2951dc..ff3834b3c611 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -21,7 +21,6 @@ #include <vector> #include <deque> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index d8e27394e5a4..8cf40304c086 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 5574cdec1423..ca5f95c347d5 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -25,7 +25,6 @@ #include <officecfg/Office/UI/Notebookbar.hxx> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <unotools/confignode.hxx> #include <comphelper/types.hxx> diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 32518f4af802..8e5a90953283 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -28,8 +28,6 @@ #include <vcl/toolbox.hxx> #include <vcl/help.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> #include <cppuhelper/compbase.hxx> using namespace css; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 9b6eab64dd97..a52f5f22040a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -45,7 +45,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <o3tl/make_unique.hxx> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/ui/ContextChangeEventObject.hpp> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index daa9787f620a..24d8266881b6 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -35,16 +35,10 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/XUIFunctionListener.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index d12bc3145a67..fbb44fc5b6e7 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/Frame.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index 439015371e49..7d837cde0c00 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -24,7 +24,6 @@ #include <sfx2/viewfrm.hxx> class SfxViewFrame; -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index b7947d3dc648..d08517f36a8c 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -33,6 +33,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/frame/FrameActionEvent.hpp> #include <com/sun/star/frame/FrameAction.hpp> +#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XBorderResizeListener.hpp> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index dcc704311a00..c7080f3a66f7 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -49,10 +49,8 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index ec40c13bf6fa..466744987f6c 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; |