diff options
394 files changed, 24 insertions, 656 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index ef8c028d47f8..5d6ad23db8a9 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index 6b8e511a6e8e..7db39b4c4340 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -20,11 +20,7 @@ #ifndef INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX #define INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame2.hpp> -#include <com/sun/star/frame/FrameActionEvent.hpp> -#include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XConnectionPointContainer.hpp> diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 5ee3fc7ae831..0cc3de24e83b 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx index b5c49dd6d311..5fd07704d691 100644 --- a/basctl/source/inc/docsignature.hxx +++ b/basctl/source/inc/docsignature.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX #define INCLUDED_BASCTL_SOURCE_INC_DOCSIGNATURE_HXX -#include <com/sun/star/frame/XModel.hpp> #include <sfx2/signaturestate.hxx> #include <memory> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index c637478f7cd9..25b45ca3b36f 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -54,7 +54,6 @@ #include <sys/resource.h> #endif -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <map> diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index fcb4f2b05593..f8f39b8b827f 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -27,7 +27,6 @@ #include <svl/lstner.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 4adc3b77ff36..727cb0a99fa5 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -26,7 +26,6 @@ #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart/XAxis.hpp> #include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 6f3120b40502..c3ca4802a03d 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -25,7 +25,6 @@ #include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 066c9b272462..c29fa506769e 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -21,6 +21,7 @@ #include "MultipleItemConverter.hxx" #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> class SdrModel; diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 9e05c4eef383..3abcbb05144b 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLEITEMCONVERTER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLEITEMCONVERTER_HXX -#include <com/sun/star/frame/XModel.hpp> - #include "ItemConverter.hxx" #include <vector> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index a385278e8cc9..c1a91ee6a389 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> -#include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/embed/XEmbeddedClient.hpp> diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index e338fdbacb92..f0b125444bf6 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -20,8 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CONTROLLERCOMMANDDISPATCH_HXX #include "CommandDispatch.hxx" -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 0656572a9ef7..4b06f17c9d26 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -24,6 +24,7 @@ #include "chartview/DrawModelWrapper.hxx" #include "macros.hxx" +#include <com/sun/star/frame/CommandGroup.hpp> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/itempool.hxx> diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index f29678e78c90..5b951ad5398f 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -34,7 +34,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 12db19ccdc75..6d06c63d240a 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -21,7 +21,6 @@ #include "CommandDispatch.hxx" -#include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/DispatchInformation.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 49d7de285103..1895f2db54d2 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -27,6 +27,7 @@ #include "chartview/DrawModelWrapper.hxx" #include "macros.hxx" +#include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <osl/mutex.hxx> diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index b98750312c16..9237bf36e218 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX -#include <com/sun/star/frame/XFramesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <tools/color.hxx> #include <svx/Palette.hxx> diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 456e89ba8ada..184632ec12de 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include "chartviewdllapi.hxx" diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 9f5998297ff0..a234fae7f653 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/frame/XModel.hpp> namespace chart { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 2aa55ef38d73..87a8f356073a 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -23,8 +23,6 @@ #include <cppuhelper/interfacecontainer.hxx> -#include <com/sun/star/frame/XModel.hpp> - using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 04f9f6b84859..0f9a14b35639 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/frame/XModel.hpp> #include "ChartModel.hxx" diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 04b37c071993..17c50c4c0c95 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -25,7 +25,6 @@ #include "resource/sharedresources.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <tools/urlobj.hxx> #include "calc/CPreparedStatement.hxx" diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 34c808989b2b..2d03917cc3e7 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -30,12 +30,6 @@ #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrames.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -77,7 +71,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::embed; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 6d1b5f1b254e..c62b5d87def0 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx @@ -27,7 +27,6 @@ namespace connectivity using namespace hsqldb; using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; // XEventListener diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 0ee24f8631b1..ebfc9e0b2014 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -47,8 +47,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/ModuleManager.hpp> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index fdd046357b67..5a535bd1acd8 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -69,7 +69,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 64b9a3ee117b..d81813ee8193 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> +#include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/theBrowseNodeFactory.hpp> diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index bfaac6c5d7e2..4053836ce02d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/XStorable.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/documentinfo.hxx> diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 9170db2e63fc..6de31e614e0c 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <sfx2/request.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 7be590b167de..0c744ca4c12e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -34,7 +34,6 @@ #include "cfgutil.hxx" #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 307b1093c20e..ded5f76078dc 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -22,10 +22,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 0436f15888ec..6ffbf8bf73c4 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -31,13 +31,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index acc0020daa1f..d409054acd92 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -23,11 +23,11 @@ #include <memory> #include <rtl/ustring.hxx> +#include <com/sun/star/frame/DispatchInformation.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <vcl/timer.hxx> #include <svtools/svtabbx.hxx> diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 4706951f129a..b99cd7f04767 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <cuires.hrc> diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx index d3b07f811662..9d3183b21e93 100644 --- a/dbaccess/qa/unit/dbtest_base.cxx +++ b/dbaccess/qa/unit/dbtest_base.cxx @@ -10,14 +10,11 @@ #include <comphelper/processfactory.hxx> #include <test/unoapi_test.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> using namespace ::com::sun::star; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 62574861b490..3a9f2c750db0 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -37,7 +37,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/NotInitializedException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -56,7 +55,6 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 8fd8ccc137b9..0532a764fb9b 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -27,6 +27,7 @@ #include "documenteventnotifier.hxx" #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> +#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 2ea984863578..919577442777 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -37,8 +37,6 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XReportEngine.hpp> @@ -94,7 +92,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/storagehelper.hxx> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index dcf2cfbb6847..4885f97e314a 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -28,7 +28,6 @@ #include "apitools.hxx" #include <comphelper/uno3.hxx> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/embed/XStateChangeListener.hpp> #include <com/sun/star/sdb/XSubDocument.hpp> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index a1010534703c..aff11ddd5376 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -29,10 +29,9 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index be5152de4821..b60d11fad841 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace xmloff::token; diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e542a07c0a1d..b271d29ddcff 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/ErrorMessageDialog.hpp> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 5262a422fff2..a4d508006ca5 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -34,8 +34,6 @@ #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/Frame.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index c9b14279c90c..634ebadfabbd 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 6695065bb57e..c57c414464ba 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; using ::com::sun::star::sdb::application::NamedDatabaseObject; diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index a7a1fb8bed96..cadd8b326721 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -23,7 +23,7 @@ #include "AppElementType.hxx" #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/lang/XComponent.hpp> #include <comphelper/sharedmutex.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index c727bdb0bba5..0517b4382832 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -91,7 +91,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 27036b7125c9..8b768662079f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> @@ -50,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::view; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index c6b45907751f..8d29764cf207 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -63,7 +63,6 @@ namespace dbaui using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::container; - using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::dbtools; using namespace ::comphelper; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 6f9dd87af9e7..0ede6f9d76cc 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -21,7 +21,6 @@ #include <dbaccess/dataview.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XController.hpp> #include <vcl/split.hxx> #include "IClipBoardTest.hxx" diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index ceca8068ae8c..fc779bcd3c6d 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index be810b75b1a0..fe42de6415ed 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index d1dd97d3f704..acad9b7e7b30 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 57eb77fe1cd6..a52e7c8176ab 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -68,7 +68,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdb::application; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ucb; OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 4ab9b6e26bce..842c57ea1c7e 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -68,7 +68,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index d764b507dd45..d92e9b244a81 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -23,10 +23,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/frame/TaskCreator.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrames.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/application/XTableUIProvider.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 2904b81b7eca..0e006a5a95ef 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -25,10 +25,8 @@ #include <comphelper/classids.hxx> #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/URL.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/ucb/OpenCommandArgument.hpp> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 28f72782687f..7241301b61c5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -23,7 +23,6 @@ #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/extract.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 6090b28014a3..c92eeaf1dfb6 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -35,7 +35,6 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; // end of temp classes OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 6a5ad4796f18..118dd30d837e 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/sdb/CommandType.hpp> @@ -61,7 +60,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/VetoException.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index cf32dbacdd39..0f171ef16410 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -31,7 +31,6 @@ #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index db857f810671..2499e94cc618 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::io; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 2da0d3c63ff3..a3264d3cb609 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XTitleChangeListener.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index ca8b14d09b08..78b3437f4ef4 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -19,7 +19,6 @@ #include <vcl/idle.hxx> #include <LibreOfficeKit/LibreOfficeKit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <desktop/dllapi.h> diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 752f2d445855..b7b32544878d 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -10,7 +10,6 @@ #include <memory> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/XReschedule.hpp> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 023c06af6e7e..640c2ec550cc 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -49,7 +49,6 @@ #include <com/sun/star/frame/theAutoRecovery.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> #include <com/sun/star/frame/SessionListener.hpp> -#include <com/sun/star/frame/XSessionManagerListener.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> #include <com/sun/star/configuration/CorruptedConfigurationException.hpp> @@ -59,12 +58,10 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/StartModule.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/configuration/MissingBootstrapFileException.hpp> #include <com/sun/star/configuration/InvalidBootstrapFileException.hpp> @@ -77,7 +74,6 @@ #include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/ui/theWindowStateConfiguration.hpp> -#include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/office/Quickstart.hpp> #include <desktop/exithelper.h> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index a1b65114b43f..242e73a625fc 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -39,12 +39,10 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> +#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/view/XPrintable.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/document/MacroExecMode.hpp> diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 4755690a7686..591f8524b8d5 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DESKTOP_SOURCE_APP_DISPATCHWATCHER_HXX #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include "officeipcthread.hxx" diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 27b9efa600db..6ec3481a649b 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -36,9 +36,6 @@ #include <vcl/svmain.hxx> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XStorable2.hpp> #include <comphelper/storagehelper.hxx> #include <cppuhelper/bootstrap.hxx> #include <unotools/mediadescriptor.hxx> diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index cc5c76b6c8e4..722ee855f9dd 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -22,7 +22,6 @@ #include <editeng/unolingu.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index c70a7ba40bd6..c87d945441b6 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -34,9 +34,6 @@ #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index fc93ae18db25..27db3956834b 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XLoadable.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 5b8cdb8c12b6..e6f04fdf5b06 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -31,9 +31,6 @@ #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 2a3e733c4b34..1c24905e9dbd 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -35,8 +35,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> -#include <com/sun/star/frame/XDispatchHelper.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XControllerBorder.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 72bea300c678..0ba477264e20 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/embed/XClassifiedObject.hpp> #include <com/sun/star/io/TempFile.hpp> diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 076c5b6b8ec5..d11f662ddc3f 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -49,10 +49,7 @@ #include <com/sun/star/frame/Frame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/lang/SystemDependent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/InteractionHandler.hpp> diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index 17905f13929a..e71d528d44ca 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -19,7 +19,6 @@ #include "embeddoc.hxx" #include <osl/diagnose.h> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 6b610785443f..cc4c77f5b920 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index fe7f72e5783c..23d856f69df1 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -21,7 +21,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include "bibliography.hrc" diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index cf0c2625c7c2..2002ac9377bf 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -23,8 +23,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include "bibconfig.hxx" @@ -60,7 +58,6 @@ BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWi using namespace osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; //split window size is a percent value #define WIN_MIN_HEIGHT 10 diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index bf67374e1665..98bb21cf99b8 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/frame/XModel.hpp> #include "dbptypes.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 9002e2ba0f40..1bf8df0f152e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -27,7 +27,6 @@ #include <comphelper/uno3.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/awt/XControlContainer.hpp> diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index de446b6116e4..b5d931aa8182 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -33,7 +33,6 @@ #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/XDispatchProvider.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 12b5c30f833d..8d937f7b6a30 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -38,7 +38,6 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 0538f40403aa..4e9f9be10a9b 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -25,9 +25,6 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/DispatchResultEvent.hpp> -#include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/office/Quickstart.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteException.hpp> diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index b3b82ca98762..4cd6346ae3c7 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -22,7 +22,6 @@ #include <vcl/graphicfilter.hxx> #include <vcl/svapp.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Sequence.h> diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 61ff445f40d1..e12a71ac7499 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -17,7 +17,6 @@ #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <fstream> #include <vcl/dibtools.hxx> #include <vcl/graph.hxx> diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 4fdd7a450626..1132009ae1e7 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -60,7 +60,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index e08ecf7280dd..9c282498ebb2 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/view/XRenderable.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #define SVG_DIALOG_SERVICE_NAME "com.sun.star.comp.Draw.SVGFilterDialog" @@ -37,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::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; using namespace ::com::sun::star::document; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 1c9ef265b501..6266e2f113fd 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -30,10 +30,8 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Parser.hpp> -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/xml/XImportFilter.hpp> #include <com/sun/star/xml/XExportFilter.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> @@ -59,7 +57,6 @@ using namespace com::sun::star::document; using namespace com::sun::star::style; using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index d44d00ac3d5c..599f3e9091d7 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/io/XActiveDataControl.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -52,7 +51,6 @@ using namespace osl; using namespace comphelper; using namespace com::sun::star; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace com::sun::star::container; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 31051679b3c5..dbf14e752ceb 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/XFlushable.hpp> @@ -53,7 +52,6 @@ using namespace osl; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::io; -using namespace com::sun::star::frame; using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::util; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index e7f3f989885a..2f0f18dec73d 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XConfigManager.hpp> - #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include <sfx2/filedlghelper.hxx> #include <unotools/localfilehelper.hxx> @@ -30,7 +28,6 @@ #include "xmlfiltersettingsdialog.hxx" using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) : diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 5367bc1a39cc..f06cc88d3304 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -25,9 +25,7 @@ #include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> -#include <com/sun/star/frame/XConfigManager.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/io/XActiveDataSource.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 1b435e617e79..bb1ac3dfa553 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/form/XApproveActionBroadcaster.hpp> #include <com/sun/star/form/submission/XSubmissionSupplier.hpp> #include <com/sun/star/form/submission/XSubmission.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/graphic/XGraphicObject.hpp> #include <cppuhelper/implbase3.hxx> diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index b13995a6ee0c..22ebb3046b2b 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -23,7 +23,6 @@ #include "formnavigation.hxx" #include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx index 7486debdb0e9..fc3d43d6d6a7 100644 --- a/forms/source/xforms/submission/submission_put.hxx +++ b/forms/source/xforms/submission/submission_put.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include "submission.hxx" diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 75cf8eebbfa4..2e44244eb601 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -30,7 +30,6 @@ #include <general.h> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index e5d9916e9564..3c34bb00e1ad 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -22,7 +22,7 @@ #include <general.h> -#include <com/sun/star/frame/XFramesSupplier.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 4deb733aeb4a..03143577c51e 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 463d69f493de..2255391c23a9 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -31,10 +31,6 @@ #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 7ace2d5c5c5e..6dc49f794135 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -24,7 +24,6 @@ #include <general.h> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 7cf4fcaa5f47..cbab719bb9a6 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/frame/XTitleChangeListener.hpp> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 207ca9f80ecf..b260f4365619 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index b6b07d9b6c71..8481064bb9a8 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/task/XJobListener.hpp> #include <com/sun/star/util/XCloseListener.hpp> -#include <com/sun/star/frame/DispatchResultEvent.hpp> #include <cppuhelper/implbase.hxx> #include <osl/conditn.hxx> diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 08ab0e1d97c9..97ba371b5387 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/DispatchResultEvent.hpp> #include <rtl/ustring.hxx> diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 7e77252155b6..0ad5e938a639 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -24,11 +24,9 @@ #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> namespace framework{ diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 609419c322d4..2b07a2487d97 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -32,15 +32,10 @@ #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/XTask.hpp> -#include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/XTasksSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/Locale.hpp> diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 7dca5f09269e..e5abb700de58 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> @@ -41,8 +40,6 @@ #include <com/sun/star/awt/XTopWindow2.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/awt/XDockableWindowListener.hpp> -#include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp> -#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index fbd1a5baaba0..cd3f61e45d3d 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -23,11 +23,9 @@ #include <uielement/toolbarmanager.hxx> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index a30e8e7db858..9427f52165f9 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -22,7 +22,6 @@ #include <helper/uielementwrapperbase.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 822841fce60a..913f2997bdb3 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/ControlCommand.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index 6b7b1a49595f..4ffbba2af918 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index 423fb8bcc37f..67b72a6be2b8 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 2397b6e73fcd..4674b0cf0ec3 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index b12ed5bd2e6b..1a91747bc702 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -27,10 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 259fb7ddfedf..078e4935298e 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index 4039809326f0..66fcc9b347ad 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -27,11 +27,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> -#include <com/sun/star/frame/status/Verb.hpp> #include <com/sun/star/frame/XModel.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 74e04cae7ed5..3c1f3a9f4e7e 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index d439a1068da5..294b913cc38a 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -27,10 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 4fd1ab8c7403..d0893f8c5e4b 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -26,12 +26,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.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/container/XNameAccess.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index c07e414d0ead..ee5345d1d450 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -25,8 +25,6 @@ #include <macros/xtypeprovider.hxx> #include <uielement/menubarmanager.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 81b679fd58e0..5d0cb2402f99 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -27,11 +27,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx index 5de553cdf3cc..2ebb4c626682 100644 --- a/framework/inc/uielement/notebookbarmenucontroller.hxx +++ b/framework/inc/uielement/notebookbarmenucontroller.hxx @@ -27,10 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 9fb8dee3b3b6..cfa073fae74f 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 51ad4ebbd074..bbafb5f55f43 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/XStatusbarController.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index e47a8d1034f4..7be5e5e47bb9 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -23,7 +23,6 @@ #include <helper/uiconfigelementwrapperbase.hxx> #include <uielement/statusbarmanager.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 7d9532eea5ac..1550e554d59f 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 86d5820b143e..9821c05cace3 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx index e4a526ed8460..40ddbae29465 100644 --- a/framework/inc/uielement/toolbarmodemenucontroller.hxx +++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx @@ -27,10 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 4f7b8085beea..c9a8429e479e 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -27,12 +27,8 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index 9bf9a8c62018..0e8da868a5a4 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -22,7 +22,6 @@ #include <helper/uiconfigelementwrapperbase.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XUIFunctionListener.hpp> diff --git a/framework/source/dispatch/dispatchdisabler.cxx b/framework/source/dispatch/dispatchdisabler.cxx index 725b2e7557fe..c93c5927ef58 100644 --- a/framework/source/dispatch/dispatchdisabler.cxx +++ b/framework/source/dispatch/dispatchdisabler.cxx @@ -12,7 +12,6 @@ #include "services.h" #include "dispatch/dispatchdisabler.hxx" -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> using namespace css; diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 7f86dbd6de18..98db6c40c283 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -24,7 +24,6 @@ #include <services.h> #include <properties.h> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XLayoutManager2.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/WindowDescriptor.hpp> diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 64f5974e227e..5fa4a17cb590 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -28,11 +28,9 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/StartModule.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 81ad5c94425c..0dcbfc24ab07 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star::uno; diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 19082f52503f..90f324c5240d 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -19,7 +19,6 @@ #include <helper/oframes.hxx> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 2b10d69972f1..ea8120050863 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> +#include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index bc0b0190354d..277f75a7779a 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -25,9 +25,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XFrameLoader.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> -#include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index a31ced460cb6..c8e9f1fa21f2 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -22,9 +22,6 @@ #include <general.h> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/CloseVetoException.hpp> diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 11f5c9bfb6fd..30feb2813b5c 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/frame/XModuleManager2.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 5fa25c937041..4e646c2701fc 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -34,11 +34,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index be8b18f8a48b..7c3c2e4b80d1 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -50,7 +50,6 @@ #include <com/sun/star/task/ErrorCodeRequest.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index d00238d6c9b5..1dcd2681c1e2 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::configuration; using namespace com::sun::star::container; -using namespace ::com::sun::star::frame; using namespace framework; namespace { diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index c44f7090ac8a..63b8c4729b89 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -37,10 +37,8 @@ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <comphelper/processfactory.hxx> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index b8c671edb931..f295feff2d14 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -20,12 +20,7 @@ #include "uielement/comboboxtoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> -#include <com/sun/star/frame/status/Visibility.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/util/Color.hpp> #include <svtools/toolboxcontroller.hxx> @@ -40,7 +35,6 @@ using namespace css::uno; using namespace css::beans; using namespace css::lang; using namespace css::frame; -using namespace css::frame::status; using namespace css::util; namespace framework diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index ced85e93f49f..7809d910c983 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -21,11 +21,9 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/XControlNotificationListener.hpp> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index ebbcb52b616f..ca5fd47985d9 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -27,7 +27,6 @@ #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/XPopupMenuController.hpp> #include <cppuhelper/supportsservice.hxx> #include <vcl/builder.hxx> diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 348d0634f4dd..d5f372cbe12a 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -20,12 +20,7 @@ #include "uielement/dropdownboxtoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> -#include <com/sun/star/frame/status/Visibility.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> @@ -39,7 +34,6 @@ using namespace css::uno; using namespace css::beans; using namespace css::lang; using namespace css::frame; -using namespace css::frame::status; using namespace css::util; namespace framework diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index c82b5dfbb7c1..3498aa5aaea4 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -20,12 +20,7 @@ #include "uielement/edittoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> -#include <com/sun/star/frame/status/Visibility.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> @@ -38,7 +33,6 @@ using namespace css::uno; using namespace css::beans; using namespace css::lang; using namespace css::frame; -using namespace css::frame::status; using namespace css::util; namespace framework diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 8efb744c9581..d139475079bf 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -41,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace com::sun::star::style; diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 8c1a64b34f44..aa6ad944faed 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 54762061bda9..dc0fe07af16a 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -22,9 +22,7 @@ #include <framework/addonsoptions.hxx> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index dc9ecb06c6cd..e8c1c11a33c8 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -34,7 +34,6 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/document/XDocumentLanguages.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <i18nlangtag/mslangid.hxx> #include <svl/languageoptions.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 15b0b488833e..471295f6a64f 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -37,12 +37,8 @@ #include <com/sun/star/document/XDocumentLanguages.hpp> #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <com/sun/star/frame/XModule.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <comphelper/processfactory.hxx> #include <tools/gen.hxx> diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index c67c7c5574fe..624b56395c00 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> @@ -43,7 +42,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace com::sun::star::style; using namespace com::sun::star::container; -using namespace ::com::sun::star::frame; namespace framework { diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 6ccdacffff05..023dc79f1332 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/util/XStringWidth.hpp> diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx b/framework/source/uielement/notebookbarmenucontroller.cxx index f29966e3ef64..f469628d4bd8 100644 --- a/framework/source/uielement/notebookbarmenucontroller.cxx +++ b/framework/source/uielement/notebookbarmenucontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <officecfg/Office/UI/Notebookbar.hxx> #include <officecfg/Office/UI/ToolbarMode.hxx> diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index d9339d6d2cd7..0cba9ca7f148 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -22,13 +22,9 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/embed/VerbAttributes.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 87b8909d40b3..806af7cfbc16 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/awt/PopupMenuDirection.hpp> #include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 25c3f223b339..e1c8668cc9c5 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -25,12 +25,7 @@ #include "uielement/spinfieldtoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> -#include <com/sun/star/frame/status/Visibility.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <svtools/toolboxcontroller.hxx> #include <osl/mutex.hxx> @@ -43,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::frame::status; using namespace ::com::sun::star::util; namespace framework diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 71e498666f36..0ef2c4ab8af6 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index d8f95a6c7e86..eb994abc893b 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -22,9 +22,7 @@ #include <framework/addonsoptions.hxx> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XControlNotificationListener.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index f08f69a2a1bb..698f826a4012 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 0fe245092540..bf04d9a127c1 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/ModuleManager.hpp> - #include <uifactory/menubarfactory.hxx> #include <uielement/statusbarwrapper.hxx> @@ -28,7 +26,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace ::com::sun::star::ui; diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx index 3ccf7f16dcd9..1b3b99a5c565 100644 --- a/framework/source/uifactory/toolbarfactory.cxx +++ b/framework/source/uifactory/toolbarfactory.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/ModuleManager.hpp> - #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> @@ -27,7 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace ::com::sun::star::ui; diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 0cedaf95dba3..ee455a54d2bb 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -49,7 +49,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::configuration; using namespace com::sun::star::container; using namespace ::com::sun::star::ui; -using namespace ::com::sun::star::frame; using namespace framework; namespace framework diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index af548adbb578..eb4cd1308911 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 066d0634b7e4..8d59b547a97a 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 283864368b5c..819897b97ffc 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -31,8 +31,8 @@ #include <tools/link.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XDispatchRecorder.hpp> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> // some other includes diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx index 2562af565b11..c6ff08e32273 100644 --- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx +++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx @@ -12,7 +12,6 @@ #include <vcl/toolbox.hxx> #include <sfx2/dllapi.h> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <vcl/tabctrl.hxx> class ChangedUIEventListener; diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index e87e7d928c45..37a64ffef609 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -11,7 +11,6 @@ #define INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX #include <sfx2/dllapi.h> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <vcl/notebookbar.hxx> class SfxBindings; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7ebafede041c..e1e683694a9f 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -24,7 +24,6 @@ #include <sfx2/signaturestate.hxx> #include <sal/types.h> #include <vcl/errcode.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index bbf2ac917faa..ffbea950e2fe 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -16,8 +16,6 @@ #include <o3tl/typed_flags_set.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> namespace sfx2 diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index c8cb5783cf99..fac7f5420c99 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -60,7 +60,6 @@ #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/view/XPrintJobBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XStorable2.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index 142f249c4627..be010e5076e2 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -23,7 +23,7 @@ #include <sfx2/sidebar/SidebarToolBox.hxx> #include <vcl/button.hxx> #include <vcl/vclptr.hxx> -#include <com/sun/star/frame/XFrame.hpp> + class ToolBox; namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index e87014708cf1..e6da3299a775 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -25,7 +25,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/ui/XContextChangeEventListener.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XToolPanel.hpp> diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 1dc2963fe941..32f5106b5eaf 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -21,7 +21,6 @@ #include <sfx2/dllapi.h> #include <vcl/toolbox.hxx> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 339b2655b8bc..c23da95f24cc 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XSubToolbarController.hpp> #include <rtl/ref.hxx> diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 128b8a4b9d4b..a0656e787c56 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -22,14 +22,8 @@ #include <memory> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatchResultListener.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/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/util/XURLTransformer.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index e4392d590f34..ba117f86b36e 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -31,9 +31,6 @@ #include <sfx2/sfxsids.hrc> #include <svl/poolitem.hxx> #include <vcl/button.hxx> -#include <com/sun/star/frame/status/Verb.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XController2.hpp> #include <tools/svborder.hxx> diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 8a2d74cfa129..2df6ac6f1de7 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XStatusbarController.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/XStatusbarItem.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 2347f0f65ef5..f67f77ce4c3d 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -28,9 +28,6 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/URLTransformer.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <deque> #include <vector> diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 754408ba94f7..0ba27ec0da52 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -37,13 +37,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XDispatchProviderInterception.hpp> -#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 21c21f5e0c10..ef86f26957f6 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -136,6 +136,7 @@ #include <svx/strarray.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/frame/XSubToolbarController.hpp> #include <svx/colorwindow.hxx> #include <svx/PaletteManager.hxx> #include <memory> diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index fe68e3e679dc..5023f56d10ac 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -23,7 +23,6 @@ #include <unotools/configitem.hxx> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> #include <unordered_map> diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index a69e8ef31dec..491231a0d6a9 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -23,7 +23,6 @@ #include <sal/config.h> #include <xmloff/dllapi.h> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/frame/XModel.hpp> #define XML_PROGRESSRANGE "ProgressRange" #define XML_PROGRESSMAX "ProgressMax" diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 0090eb45f119..1e0da3dde3ba 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <xmloff/xmlexppr.hxx> diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx index 66768fa27a8c..ccdd2f05dadd 100644 --- a/include/xmloff/numehelp.hxx +++ b/include/xmloff/numehelp.hxx @@ -24,7 +24,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/dllapi.h> #include <sal/types.h> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <set> diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 3ea5bf57c242..860d8f16da04 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/linguistic2/DictionaryType.hpp> diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index cfa6b42ff405..e226ed6c0459 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -71,8 +71,6 @@ #include <vcl/svapp.hxx> #include <xmloff/attrlist.hxx> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XText.hpp> @@ -84,7 +82,6 @@ using namespace ::cppu; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::text; using namespace ::com::sun::star::io; using namespace ::com::sun::star::registry; diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx index 814fdcd2ba5b..2f660a8cf306 100644 --- a/oox/inc/drawingml/textrun.hxx +++ b/oox/inc/drawingml/textrun.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/text/XText.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <drawingml/textcharacterproperties.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 7645f448b0d4..9e5ee8f3ebc3 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include "basegfx/numeric/ftools.hxx" @@ -48,7 +47,6 @@ namespace cssc = ::com::sun::star::chart; using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index b9d4720d9e1c..e2f12a71caec 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -42,7 +42,6 @@ namespace drawingml { namespace chart { using namespace ::com::sun::star::chart2; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx index 5a4b3213d2f7..9f09950837e2 100644 --- a/oox/source/drawingml/shape3dproperties.cxx +++ b/oox/source/drawingml/shape3dproperties.cxx @@ -19,7 +19,6 @@ #include "drawingml/shape3dproperties.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 306bcf3ba384..2b58cfe30c98 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 444832be7592..b33d2fe6647d 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 84e74b252438..a7ea19c1d103 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; namespace oox { namespace drawingml { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 30c570b01eec..fb114290f25b 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/awt/XUnitConversion.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/graphic/GraphicObject.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 9c415af67604..99048137b563 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::text; using namespace ::com::sun::star::drawing; diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 6e1563781bf5..b8ce7e51af33 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/animations/XAnimateColor.hpp> #include <com/sun/star/animations/XAnimateMotion.hpp> #include <com/sun/star/animations/XAnimateTransform.hpp> @@ -49,7 +48,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::presentation; namespace oox { namespace ppt { diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 5344bda9dacc..4dcd58d1039e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -60,8 +60,6 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 957f37500ad4..0ffc8ecd7a43 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::io; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 08fd8fb6f560..cd53be77a13d 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -24,12 +24,8 @@ #include <toolkit/awt/vclxwindow.hxx> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrameLoader.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -37,7 +33,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XSet.hpp> diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 25e514552b10..fcc3f6b83723 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -51,7 +51,6 @@ #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/report/XFixedLine.hpp> -#include <com/sun/star/frame/XController.hpp> #include "RptDef.hxx" #include <vcl/svapp.hxx> #include <osl/mutex.hxx> diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index fddd29893ccc..f784891eff04 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -22,7 +22,6 @@ #include <xmloff/xmlprmap.hxx> #include <xmloff/contextid.hxx> #include <xmloff/controlpropertyhdl.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <memory> diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 40e0373edbeb..7634f4f589ff 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace xmloff::token; diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index e111f483e34f..89b4e795a0b3 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <svtools/transfer.hxx> diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index d946923dd97b..898821be753d 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -20,7 +20,6 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX #include <dbaccess/dataview.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/report/XReportComponent.hpp> #include <vcl/split.hxx> diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 6db2ee4b49b8..cc25964c9cb0 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -18,7 +18,6 @@ */ #include "toolboxcontroller.hxx" #include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/menu.hxx> diff --git a/sc/qa/extras/check_data_pilot_field.cxx b/sc/qa/extras/check_data_pilot_field.cxx index e4013727015a..f5a4163e74c3 100644 --- a/sc/qa/extras/check_data_pilot_field.cxx +++ b/sc/qa/extras/check_data_pilot_field.cxx @@ -29,7 +29,6 @@ using namespace css; using namespace css::lang; -using namespace css::frame; namespace sc_apitest { diff --git a/sc/qa/extras/check_data_pilot_table.cxx b/sc/qa/extras/check_data_pilot_table.cxx index d69fd5d21abe..2375d80bd577 100644 --- a/sc/qa/extras/check_data_pilot_table.cxx +++ b/sc/qa/extras/check_data_pilot_table.cxx @@ -31,7 +31,6 @@ using namespace css; using namespace css::lang; -using namespace css::frame; namespace sc_apitest { diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx b/sc/qa/extras/check_xcell_ranges_query.cxx index ad8f0b0cc31f..ec5d44cb3d2d 100644 --- a/sc/qa/extras/check_xcell_ranges_query.cxx +++ b/sc/qa/extras/check_xcell_ranges_query.cxx @@ -21,7 +21,6 @@ using namespace css; using namespace css::lang; -using namespace css::frame; namespace sc_apitest { diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx index 99521d876192..a5adfd0070b3 100644 --- a/sc/qa/perf/scperfobj.cxx +++ b/sc/qa/perf/scperfobj.cxx @@ -13,7 +13,6 @@ #include "cppunit/extensions/HelperMacros.h" #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/util/XSearchable.hpp> diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 942042194bf7..89448c9d6c31 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -15,7 +15,6 @@ #include "tabvwsh.hxx" #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel2.hpp> #include "helper/qahelper.hxx" diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index e2980ba7f164..ca2ec7d792cf 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -81,9 +81,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> #include <com/sun/star/sheet/GeneralFunction2.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 84dd944fd941..be204c1f8deb 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -26,7 +26,6 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/xmlaustp.hxx> #include <xmloff/xmlstyle.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/DateTime.hpp> #include "xmlsubti.hxx" #include "global.hxx" diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 49a16ace04a3..49c00d6c9a86 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace xmloff::token; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index b261e56b60c1..3c928301af6b 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 5f14c552c5ba..869513e6f0b0 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> using namespace ::com::sun::star; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index ea4c33c964e1..4d417c403362 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -49,8 +49,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <com/sun/star/embed/EmbedVerbs.hpp> -#include <com/sun/star/frame/XSynchronousFrameLoader.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 43194bb5b11b..026a4c9b7b18 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -23,7 +23,6 @@ #include <svl/poolitem.hxx> #include <sfx2/tbxctrl.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <svx/zoomslideritem.hxx> class ScZoomSliderControl : public SfxToolBoxControl diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 2fe6d5b7df40..6d21cf1c7d08 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -22,9 +22,6 @@ #include "scopetools.hxx" #include "viewdata.hxx" -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XDesktop2.hpp> - #include <comphelper/random.hxx> #include <svtools/svlbitm.hxx> #include <svtools/treelistentry.hxx> diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index d9b407fddc9f..47b94985dd5b 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sheet/XCalculatable.hpp> diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 02c0b8c517b2..11951f575212 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -21,7 +21,6 @@ #include <ooo/vba/excel/XFormatCondition.hpp> #include <ooo/vba/excel/XFormatConditions.hpp> #include <ooo/vba/excel/XStyle.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/sheet/XSheetConditionalEntries.hpp> #include <com/sun/star/sheet/XSheetConditionalEntry.hpp> #include <com/sun/star/sheet/XSheetCondition.hpp> diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 145cab4a3180..7395b4cdec7e 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/sheet/XSpreadsheetView.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <ooo/vba/excel/XlFileFormat.hpp> #include <ooo/vba/excel/XApplication.hpp> diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index f9384943abe0..68c0216371d7 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -18,16 +18,11 @@ */ #include <comphelper/processfactory.hxx> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 9da55235419c..05098b3ffcfd 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/table/XTableChartsSupplier.hpp> diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 98644722393c..303418f94b3a 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -24,6 +24,7 @@ #include <cppuhelper/implbase.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 7aacf487fb54..48aa4828c9c6 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <unordered_map> diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 72df74cbe843..a22259f58db4 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/text/WritingMode.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <vcl/print.hxx> #include <vcl/idle.hxx> #include <svx/fmmodel.hxx> diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index b6d346fdd1d3..2a7642b2a813 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -50,8 +50,6 @@ #include "prltempl.hrc" #include <comphelper/servicehelper.hxx> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XDesktop2.hpp> #include <comphelper/processfactory.hxx> #include <unotest/macros_test.hxx> diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 53f4af894add..6dee57e3df3a 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -58,7 +58,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/WritingMode2.hpp> diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 4fdb8fb074ce..87a20a34ab8c 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -19,7 +19,6 @@ #include <osl/file.hxx> #include <osl/module.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -42,7 +41,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::document; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using namespace com::sun::star::frame; using namespace com::sun::star::ui::dialogs; #include "pres.hxx" diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 84f0e9a7338a..408fb9a97f3b 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; -using namespace ::com::sun::star::frame; SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 1d6a6fc038bb..a49dc6a37869 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index d23f72b82d94..41380c4dc93b 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 4b77cce1ef73..30030f7e33c7 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index cbe7be1a746f..71a20cbb8021 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX #include <com/sun/star/drawing/XDrawView.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <vcl/dialog.hxx> #include <vcl/layout.hxx> #include <vcl/field.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 854e6cf226a2..5539f53efcb8 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -22,8 +22,6 @@ #include <boost/property_tree/json_parser.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/text/XText.hpp> diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1f61a4c1f07d..e23690f2f339 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/text/WritingMode.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/DrawViewMode.hpp> diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 793fd7be5e14..ac83c8c01f1c 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/drawing/framework/XResourceFactory.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index a92f734adce5..ca992a26ca66 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -26,7 +26,6 @@ #include <vcl/dialog.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 1329a05c4458..011c612ff2f4 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_FULLSCREENPANE_HXX #include "FrameWindowPane.hxx" -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/vclevent.hxx> #include <vcl/window.hxx> diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 782f23f006e7..d22bd8128c55 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -23,7 +23,6 @@ #include "ViewShell.hxx" #include "ShellFactory.hxx" #include <rtl/ustring.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <sal/types.h> #include <memory> diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 22a4ab501001..c9761a5888f8 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_VIEWSHELLBASE_HXX #define INCLUDED_SD_SOURCE_UI_INC_VIEWSHELLBASE_HXX -#include <com/sun/star/frame/XFrame.hpp> - #include "ViewShell.hxx" #include "glob.hxx" diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 3d3061a2266a..270bfb6c59ae 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -22,7 +22,6 @@ #include "MutexOwner.hxx" #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 05ee4a9e3404..115df7eeafd8 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -16,7 +16,6 @@ using namespace sd; using namespace ::com::sun::star::presentation; -using namespace ::com::sun::star::frame; Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator, sd::Transmitter *aTransmitter ): diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 1e7bc4cca395..08ee3349a64f 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -10,7 +10,6 @@ #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_LISTENER_HXX #include <sal/config.h> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/presentation/XSlideShowListener.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 85c80b19bfeb..9d24a6cf006b 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -12,7 +12,6 @@ #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <comphelper/processfactory.hxx> @@ -22,7 +21,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/presentation/SlideShow.hpp> using namespace sd; using namespace ::osl; diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index ae147d43cb00..d0588b522e69 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -31,7 +31,6 @@ #include "ViewShellBase.hxx" #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "stlpool.hxx" #include <svx/xfillit0.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 770ea132666b..c3e635a3ca87 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -51,7 +51,6 @@ #include <vcl/floatwin.hxx> #include <xmloff/autolayout.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 9deef401d79e..5deddae4e7f6 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -32,7 +32,6 @@ #include "unomodel.hxx" #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 8fef14a85e3d..ffc56773e309 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -25,7 +25,6 @@ #include <osl/mutex.hxx> #include <vcl/image.hxx> #include "PreviewRenderer.hxx" -#include <com/sun/star/frame/XModel.hpp> #include <vcl/timer.hxx> #include "tools/SdGlobalResourceContainer.hxx" diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 1441206ebb0f..b38442bafa2c 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -33,7 +33,6 @@ #include "unomodel.hxx" #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 0ece3318e0d1..c7ace1a146e8 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -33,7 +33,6 @@ #include <sfx2/sidebar/ControlFactory.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <com/sun/star/drawing/XDrawView.hpp> -#include <com/sun/star/frame/XModel.hpp> #include "fupage.hxx" #include <svx/papersizelistbox.hxx> #include <svx/xflclit.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 8b06f80ecf65..4d56ea0029b9 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -20,7 +20,6 @@ #include <config_features.h> #include <com/sun/star/frame/theAutoRecovery.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 69878f2ef874..856ef30e5eff 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -72,7 +72,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 1d359ace214d..5005fb49a07e 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -18,7 +18,6 @@ */ #include "tools/SlotStateListener.hxx" -#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index da16dd12c53e..0a5fd35da367 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -59,7 +59,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::i18n; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index 8daa26955419..2519c5fd7cbc 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNODOCUMENTSETTINGS_HXX #define INCLUDED_SD_SOURCE_UI_UNOIDL_UNODOCUMENTSETTINGS_HXX -#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/uno/XInterface.hpp> class SdXImpressDocument; diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 4278ec5a011e..8215ee189c9b 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -27,7 +27,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 28fd17b14d32..930e496ef09b 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -55,10 +55,7 @@ #include "sdattr.hxx" #include "optsitem.hxx" -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index f182d0d21975..7e28f6723cf5 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -19,7 +19,6 @@ #include "sddll.hxx" -#include <com/sun/star/frame/XFrame.hpp> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/app.hxx> @@ -56,7 +55,6 @@ #include "smarttag.hxx" using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; namespace sd { diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 3bd0dcfde17f..2206093bc1f7 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -19,7 +19,6 @@ #include "configurationaccess.hxx" -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XChangesBatch.hpp> diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 6e03ff69a0c3..6890498fcdf9 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -21,7 +21,6 @@ #include "graphiccollector.hxx" #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 530f01bcf33a..60c69bba124c 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -29,12 +29,9 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XItemEventBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/io/XStream.hpp> #include <cppuhelper/implbase.hxx> diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 2631a1d7897e..1448c31763eb 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -21,12 +21,11 @@ #include "optimizerdialog.hxx" #include "pppoptimizer.hxx" #include "fileopendialog.hxx" +#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <sal/macros.h> #include <osl/time.h> #include <tools/urlobj.hxx> diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index c2cb67574426..3e33c10f8409 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -33,13 +33,10 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XItemEventBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/awt/PushButtonType.hpp> #include <cppuhelper/implbase.hxx> diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index db480caec1da..c8ea1ec7fbf9 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontWeight.hpp> +#include <com/sun/star/frame/XStorable.hpp> #include <rtl/ustrbuf.hxx> #include <sal/macros.h> diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 9c949ebfea9f..fd2a3a00e62d 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/awt/XMessageBoxFactory.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XControlAccess.hpp> diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 7a00abf6b4ac..b4fd1e83ab60 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/io/XSeekable.hpp> diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 93830880e5b7..57e12a301002 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -27,7 +27,6 @@ #include "PresenterPaneFactory.hxx" #include "PresenterViewFactory.hxx" #include "PresenterWindowManager.hxx" -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/drawing/SlideSorter.hpp> #include <com/sun/star/drawing/framework/Configuration.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index f699c7b1b2ba..7df32ae592a8 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XResourceFactory.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ref.hxx> #include <memory> diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 188bc075b1f3..38843be80939 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -11,7 +11,6 @@ #define INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <rtl/ustring.hxx> #include <tools/link.hxx> #include <sfx2/dllapi.h> 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; diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 98f1cae40ac7..b0f4a1fa8011 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -39,7 +39,6 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <tools/stream.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 4db733bb0cd2..97cf89135e93 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -27,7 +27,6 @@ #include "com/sun/star/frame/Desktop.hpp" #include "com/sun/star/frame/DispatchResultEvent.hpp" #include "com/sun/star/frame/DispatchResultState.hpp" -#include "com/sun/star/frame/XComponentLoader.hpp" #include "com/sun/star/frame/XController.hpp" #include "com/sun/star/frame/XDispatchProvider.hpp" #include "com/sun/star/frame/XDispatchResultListener.hpp" diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 0d7bd9f7272e..b119f6a5b0d0 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index ffc9d68cd2ac..95aea5119320 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -30,7 +30,6 @@ #include "exportdialog.hxx" #include <uno/mapping.hxx> #include <tools/fldunit.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 0ab20dc6a20e..482f88b9783a 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -21,11 +21,9 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 792612a61ca3..f615c7a0fe80 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index 33f4e23b7969..198b3d909302 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -23,8 +23,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 0d5814ce75ea..58f613d41480 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/theAutoRecovery.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 0be72783d6c3..2d940705e3a1 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -50,7 +50,6 @@ #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include <com/sun/star/xforms/XFormsSupplier.hpp> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a0f119211fc5..1d6e48f2ebdf 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -141,7 +141,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form; using namespace ::com::sun::star::form::runtime; -using namespace ::com::sun::star::frame; using namespace ::svxform; FmDesignModeChangedHint::FmDesignModeChangedHint( bool bDesMode ) diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 8555605d170d..c482e46bba8a 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 74a34e24aba4..1132e823f5bd 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/form/control/FilterControl.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/sdb/ParametersRequest.hpp> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index ead49e1532f2..6acf7747cc79 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; SvxFmAbsRecWin::SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 3b5ad1aa0f56..be2559b94aa5 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XForms.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XMap.hpp> diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 1dd4d20dfa10..9a08becee8ff 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/container/ContainerEvent.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 7ae1a8f0bb2d..0c624b532c93 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/awt/XTextComponent.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 1b9a365c3481..d28b0ae0fb48 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -52,12 +52,9 @@ #include <com/sun/star/form/XGridControlListener.hpp> #include <com/sun/star/form/XLoadListener.hpp> #include <com/sun/star/form/XResetListener.hpp> -#include <com/sun/star/frame/DispatchDescriptor.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/XDispatchProviderInterceptor.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 4f02866ec33a..14c58c3a2698 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index c38ae0754f1b..9b4867a6b809 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -9,7 +9,6 @@ #include <editeng/fhgtitem.hxx> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XSidebar.hpp> -#include <com/sun/star/frame/XToolbarController.hpp> #include <svx/sidebar/PanelLayout.hxx> diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 7f9dfec5816a..e63fbd48899e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 4c4b7305b147..08c1964c1f37 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -60,7 +60,6 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 90d104ae5e14..d2c8a32fb285 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDispatchHelper.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XStatusListener.hpp> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 3e4eacd4186a..3704e35447f0 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -27,8 +27,6 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> namespace textconversiondlgs diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index b0e81e2ba8c6..2ccd40356451 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -23,7 +23,6 @@ #include <cppuhelper/component.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index e4ae5760b944..5b5fbdab097b 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -21,7 +21,6 @@ #include <osl/mutex.hxx> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -81,7 +80,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index ce631e0e99d0..2a352ddb473a 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -22,7 +22,6 @@ #include <docrecovery.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 05078ff93672..2e0daa9819a0 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx index 2b2e3dcd32e4..cf7db110adf4 100644 --- a/sw/qa/core/layout-test.cxx +++ b/sw/qa/core/layout-test.cxx @@ -16,7 +16,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <sfx2/app.hxx> diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 7ee048ad4b70..b356a5f237fc 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -13,15 +13,12 @@ #include <rtl/strbuf.hxx> #include <osl/file.hxx> -#include <com/sun/star/frame/XDesktop.hpp> - #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/SearchOptions2.hpp> #include <com/sun/star/util/SearchAlgorithms2.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/document/MacroExecMode.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 3b5e7a11d996..890426bb7b57 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index c56c5f7ed5c9..dbdb2a08e8bb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index e80e348ca196..9a43087df0c8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index a2b3f60ee6f1..a690c4519ea7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index d473a13f73e2..db20995238e3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index b37686417f72..7386247ffd3d 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -14,7 +14,6 @@ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/ShadowFormat.hpp> diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index edb7683ff03a..fa7abe2d94e0 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -69,7 +69,6 @@ #include <pausethreadstarting.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index e7c70c98162d..acdeb1ddf622 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -69,7 +69,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index a64ab5cab11a..ac5c6b6b128c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -42,7 +42,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/container/XEnumeration.hpp> diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 5eae4234f373..5f60b4e0a814 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -31,7 +31,6 @@ #include <doc.hxx> #include <modcfg.hxx> #include <swmodule.hxx> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextTableCursor.hpp> diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 5db8f4dd8d85..c5002b382f33 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/view/DocumentZoomType.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/awt/PosSize.hpp> diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index a0cca33527fa..c7fd7421a824 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -18,16 +18,11 @@ */ #include <comphelper/processfactory.hxx> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 62a75141612a..5fd2190b02f1 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -19,7 +19,6 @@ #include "vbaheaderfooterhelper.hxx" #include "wordvbahelper.hxx" #include <comphelper/processfactory.hxx> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/text/XTextRange.hpp> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 959a60efa235..4d45596c01cd 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -88,6 +88,7 @@ #include <editeng/unolingu.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdb/TextConnectionSettings.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 460dce33e3b5..82b2369df284 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -57,7 +57,6 @@ sal_uInt16 SwView::m_nMoveType = NID_PGE; sal_Int32 SwView::m_nActMark = 0; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly ) { diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 1b91d71f71b1..8cbf68550830 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -32,7 +32,6 @@ #include "com/sun/star/document/XStorageBasedDocument.hpp" #include "com/sun/star/frame/UnknownModuleException.hpp" #include "com/sun/star/frame/theGlobalEventBroadcaster.hpp" -#include "com/sun/star/frame/XStorable.hpp" #include "com/sun/star/frame/ModuleManager.hpp" #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/lang/NotInitializedException.hpp" diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 95d015b41d7c..7842820cfcf2 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/enumrange.hxx> diff --git a/unotools/source/misc/ZipPackageHelper.cxx b/unotools/source/misc/ZipPackageHelper.cxx index 763d01c222ac..609b863c6710 100644 --- a/unotools/source/misc/ZipPackageHelper.cxx +++ b/unotools/source/misc/ZipPackageHelper.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/io/XActiveDataControl.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -49,7 +48,6 @@ using namespace osl; using namespace comphelper; using namespace com::sun::star; using namespace com::sun::star::lang; -using namespace com::sun::star::frame; using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace com::sun::star::container; diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index a7f7b261acf0..0e6c08c20d25 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -23,7 +23,6 @@ #include <ooo/vba/msforms/XUserForm.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <vbahelper/vbahelperinterface.hxx> #include "vbacontrol.hxx" diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 8d84bab5cec0..4933e902ecb5 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 17ccb4d4cfc5..1b999557ca2e 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -19,8 +19,6 @@ #include "vbacommandbar.hxx" #include "vbacommandbarcontrols.hxx" #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index ec2a439b89dd..27340c9e4873 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index e24a38427838..161cf2c7b4ac 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -23,17 +23,13 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index ed718c171712..87b6fac6df38 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -20,6 +20,7 @@ #include "vbahelper/vbaeventshelperbase.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 80db71b984d3..31549918acfe 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -22,10 +22,8 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel2.hpp> -#include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> #include <com/sun/star/script/Converter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 3fcf82b4e59c..00255a1a63bb 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -67,7 +67,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/awt/XToolkit.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 10ececc28181..18973376d7a1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -26,7 +26,6 @@ #include <config_gio.h> #include <com/sun/star/awt/Toolkit.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 249194fc9eec..767916cfbe09 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -26,7 +26,6 @@ #include <config_gio.h> #include <com/sun/star/awt/Toolkit.hpp> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index b5bca9f75da2..e1a3abaae738 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/awt/XTopWindowListener.hpp> #include <com/sun/star/awt/XExtendedToolkit.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <gtk/gtk.h> diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx index aa206adff80e..dbf94287ef8a 100644 --- a/writerperfect/qa/unit/WpftLoader.cxx +++ b/writerperfect/qa/unit/WpftLoader.cxx @@ -18,7 +18,6 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDesktop2.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index cbabe0890bed..bd50ffd10ebe 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 64b7063c69ea..7c79c74de755 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -27,7 +27,6 @@ #include <unotools/configmgr.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/processfactory.hxx> @@ -170,7 +169,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::configuration; using namespace com::sun::star::lang; using namespace com::sun::star::util; -using namespace com::sun::star::frame; using namespace com::sun::star::container; using namespace com::sun::star::deployment; diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 7a743e3f2881..ae92040a00c2 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -31,7 +31,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> #include <comphelper/sequence.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index c9fc928ea58a..9c0699b80ca7 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifiable2.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <tools/globname.hxx> #include <comphelper/classids.hxx> #include <xmloff/nmspmap.hxx> @@ -36,7 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::document; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 2d489bc1cdb4..fa7806591c11 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -68,7 +68,6 @@ using ::com::sun::star::beans::XPropertySetInfo; using namespace ::osl; using namespace ::com::sun::star; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::io; diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 3c020e881ee3..8cdf2c982e74 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -22,7 +22,6 @@ #include <xmloff/xmlexp.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 88802df89d70..9dcf7715a76a 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -21,7 +21,6 @@ #define INCLUDED_XMLOFF_SOURCE_DRAW_SDXMLIMP_IMPL_HXX #include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <xmloff/xmltkmap.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 3cf618b80fba..8023489dfd9a 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -38,7 +38,6 @@ namespace xmloff using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; - using namespace ::com::sun::star::frame; //= OFormLayerXMLExport diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 8083a344bd21..8e4f8f91bbb8 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -34,7 +34,6 @@ namespace xmloff using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::frame; using namespace ::com::sun::star::xml; using ::xmloff::token::XML_FORMS; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 4e57083a972a..cab4c928609c 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -19,7 +19,6 @@ #include "MetaExportComponent.hxx" #include "facreg.hxx" -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 8cb43a1decef..08f6855fbf21 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -29,7 +29,6 @@ #include <xmloff/xmlexppr.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index be9f7f05651e..20eba28436b8 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 11bdee3aeafb..cc2f785a2bb9 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/text/FilenameDisplayFormat.hpp> #include <com/sun/star/text/ChapterFormat.hpp> #include <com/sun/star/text/TemplateDisplayFormat.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 42d1af88e658..867e9dbfe18f 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -126,7 +126,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::util; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::document; -using namespace ::com::sun::star::frame; using namespace ::xmloff; using namespace ::xmloff::token; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index a91769256c44..be36e6cfc75a 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -60,7 +59,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; -using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; |