diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-09 20:53:32 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-17 12:25:07 +0100 |
| commit | f36fba3b854e4b4e2a79084ae56d1037c159e160 (patch) | |
| tree | e0b58a78f01048de23d684f8f1a31db6e8696a3b /framework/inc/dispatch | |
| parent | 4c016d70043f8fc4709eacbcef496ab0d9b65c15 (diff) | |
fwk: Use constructor feature for Frame.
Change-Id: I5f7ee46671b22d17c5cb060f96342727d566fa21
Diffstat (limited to 'framework/inc/dispatch')
| -rw-r--r-- | framework/inc/dispatch/dispatchprovider.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/dispatch/interceptionhelper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/dispatch/menudispatcher.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 741930a3d31b..6c6e9283393f 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHPROVIDER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHPROVIDER_HXX -#include <services/frame.hxx> - #include <classes/protocolhandlercache.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -35,7 +33,9 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 529256b83672..cceb60249f71 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -20,13 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX -#include <services/frame.hxx> #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/generic.hxx> #include <general.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 7a957d5fa233..8a6c25a4126d 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_MENUDISPATCHER_HXX #include <classes/taskcreator.hxx> -#include <services/frame.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -40,6 +39,7 @@ #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/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index c2fe7de91ef5..3ec5d83bf8eb 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX -#include <services/frame.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> |