diff options
47 files changed, 5 insertions, 49 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 30f181b09ae2..389903b959cd 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <general.h> diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 185fe8a9fc42..5e7818159a1d 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -23,7 +23,6 @@ #include <classes/protocolhandlercache.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <com/sun/star/lang/XTypeProvider.hpp> diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index abe0d128c8e0..03084af6d3a4 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 59501607f8b5..b1ef800537c8 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 6b82239c03e4..461b2f14bb8a 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 22c29de79ecd..c6424b3f4392 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 44805ab1d34a..6d37e3f29087 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <general.h> diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 4de848467fe1..bd4d60400d61 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index b84e74196f89..b13bae4aa980 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -22,7 +22,6 @@ #include <classes/framecontainer.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index fb22500f6a0c..df4a3a2d2be5 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/frame/XFramesSupplier.hpp> diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index cb255234277d..71220b2eeb19 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index a2e2dc42e074..a5002d1a12e0 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -22,7 +22,6 @@ #include <classes/framecontainer.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 40730a4c6bde..aed7472f3680 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 3f2cbf11a53d..395d235166a6 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -24,7 +24,6 @@ #include <helper/statusindicatorfactory.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> // include UNO interfaces #include <com/sun/star/task/XStatusIndicator.hpp> diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 3b2389dd3174..184e213452ea 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -27,7 +27,6 @@ // include files of own module #include <helper/wakeupthread.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index e3f390c92f79..6cfe075a10c7 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index eaebcf8fb2d6..e69e01ad0641 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 947fcab7efdd..371a698260f6 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index c8a41bd192da..cd5586b1577a 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 305a819a7a89..ec831947b63e 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 10f3daf1ff43..54c24b4e0230 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 8cf548714ab1..d4982c29c3d2 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -23,7 +23,6 @@ #include <jobs/jobresult.hxx> #include <jobs/jobdata.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <general.h> diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 766f6e54562c..51ff8a25bd91 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 0cd37a826e2d..5106ba6b9e1c 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -26,7 +26,6 @@ #include <vector> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <rtl/ustring.hxx> diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index 5942e85aff6e..7d291dba36c0 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 6b151785eefa..7dca5f09269e 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX -#include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <properties.h> #include <stdtypes.h> #include <uielement/menubarmanager.hxx> @@ -52,6 +50,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertycontainer.hxx> +#include <comphelper/uno3.hxx> #include <tools/wintypes.hxx> #include <svtools/miscopt.hxx> #include <vcl/toolbox.hxx> @@ -82,8 +81,8 @@ namespace framework virtual ~LayoutManager() override; /** declaration of XInterface, XTypeProvider, XServiceInfo */ - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + DECLARE_XINTERFACE() + DECLARE_XTYPEPROVIDER() virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.framework.LayoutManager"); diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 5db3416d50ec..d45fe83591ef 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 4194ba1dc8b1..cba09eb585c0 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <general.h> diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx index 8e9ddcae3174..cc04ce97a084 100644 --- a/framework/inc/tabwin/tabwinfactory.hxx +++ b/framework/inc/tabwin/tabwinfactory.hxx @@ -22,7 +22,6 @@ #include <stdtypes.h> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <services.h> diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 7123836958ec..b1f9d7b10224 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index d2b5522c0ade..0f1ade5d6d7d 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uiconfiguration/imagetype.hxx> diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 498bbbe3f0d8..a50e1a2de79e 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -22,7 +22,6 @@ #include <uielement/toolbarmanager.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index d1b983aee9cd..87490d7c3955 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 2d16b4f3f362..a0b8a10a402e 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <helper/shareablemutex.hxx> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 877b28c668ef..c07e414d0ead 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -21,6 +21,8 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARWRAPPER_HXX #include <helper/uiconfigelementwrapperbase.hxx> +#include <macros/xinterface.hxx> +#include <macros/xtypeprovider.hxx> #include <uielement/menubarmanager.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index 62f53221a646..2ab9326971aa 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -22,7 +22,6 @@ #include <helper/uielementwrapperbase.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index b6d120154009..86dba68ec231 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <helper/shareablemutex.hxx> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 5170d6e70d61..cc94fd0f3a30 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index 4dd0b069a98a..b175f84d9360 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 9876d6b61ef8..62d213a3c4db 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include <uielement/commandinfo.hxx> diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 5128178b9613..9b8fe42f1f75 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 7d7cd6c7b268..097a409c80d3 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -23,7 +23,6 @@ #include <accelerators/presethandler.hxx> #include <accelerators/acceleratorcache.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <general.h> #include <stdtypes.h> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index abbe95341344..d58e23f48fa7 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -26,7 +26,6 @@ #include <vector> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <properties.h> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index ef3b725c80f6..d48b8f27269c 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uiconfiguration/imagetype.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 03bb59cbce0a..b39301f669f8 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -55,7 +55,6 @@ #include <rtl/ref.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <stdtypes.h> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 6b7ef00b33c3..ba5d900fe203 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -25,7 +25,6 @@ #include <uielement/statusbarmerger.hxx> #include <uielement/statusbaritem.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <stdtypes.h> #include "services.h" #include "general.h" diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index b79357daa4ef..03c45f441398 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -36,7 +36,6 @@ #include <rtl/ustrbuf.hxx> #include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> #include <services.h> |