diff options
Diffstat (limited to 'framework')
9 files changed, 5 insertions, 8 deletions
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 8115f758ea3e..6a4737fa600a 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -26,7 +26,6 @@ // include files of own module #include <helper/wakeupthread.hxx> -#include <macros/xserviceinfo.hxx> #include <general.h> // include uno interfaces diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 56b05bb7030b..c8d87969139d 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 84b4e9679c36..c0559bfcba75 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uiconfiguration/imagetype.hxx> @@ -33,6 +32,7 @@ #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 86ee6be1e3af..1b34b38a3cb2 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX #define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -28,6 +27,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 7fa19574128d..5fa25c937041 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -25,7 +25,6 @@ */ #include <vector> -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <properties.h> #include <uiconfiguration/globalsettings.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 4c65be95afdf..8f4d3942a354 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uiconfiguration/imagetype.hxx> @@ -33,6 +32,7 @@ #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <cppuhelper/weak.hxx> diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index a9946b55fd3d..1b791577e438 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 3759999af920..15b0b488833e 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -54,7 +54,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> -#include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <map> diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 556b52df2c18..520525366a5c 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -35,7 +35,6 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <macros/xserviceinfo.hxx> #include <services.h> using namespace com::sun::star::uno; |