diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-07-08 20:31:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-09 08:27:53 +0200 |
commit | 6653107b838be22da2ceb6e9123dafe67b45dd91 (patch) | |
tree | 769d2981f3255905dfce762e16c42ff6a863acc9 /framework/inc/dispatch | |
parent | 5483d4e10aad27889b961b9cb94d7ba6c86aed0b (diff) |
clean up macro usage
Change-Id: I06669718f692cc5e9e209b4e490365f4f016afdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98389
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc/dispatch')
-rw-r--r-- | framework/inc/dispatch/mailtodispatcher.hxx | 4 | ||||
-rw-r--r-- | framework/inc/dispatch/oxt_handler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 4 | ||||
-rw-r--r-- | framework/inc/dispatch/servicehandler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/dispatch/systemexec.hxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index e76fadfb6b2b..459d7ee0cbd3 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX -#include <macros/xserviceinfo.hxx> - #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index bc9c24070cde..4f5e084e3870 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX -#include <macros/xserviceinfo.hxx> - #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/document/XExtendedFilterDetection.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 845e5c92592d..8d67ee008f18 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX -#include <macros/xserviceinfo.hxx> - #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> @@ -32,6 +30,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 47fcd7e44ba8..0ca163823fec 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX -#include <macros/xserviceinfo.hxx> - #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 238b15192996..3035276c7cee 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX -#include <macros/xserviceinfo.hxx> - #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> |