diff options
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/classes/menumanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/jobs/helponstartup.hxx | 9 | ||||
| -rw-r--r-- | framework/inc/jobs/job.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/services.h | 1 | ||||
| -rw-r--r-- | framework/inc/services/desktop.hxx | 9 |
5 files changed, 10 insertions, 15 deletions
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 81e1711b4fef..8e2ac6f076e8 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -83,7 +83,7 @@ class MenuManager : public ThreadHelpBase , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory(); - static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex); + static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,IMutex& _rMutex); static void FillMenuImages( ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame, Menu* _pMenu, diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 4111c98bbae0..09f949aae37b 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -31,6 +31,7 @@ #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/XDesktop2.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> @@ -53,7 +54,7 @@ class HelpOnStartup : private ThreadHelpBase //....................................... /** @short reference to an uno service manager. */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; + css::uno::Reference< css::uno::XComponentContext > m_xContext; //....................................... /** @short such module manager is used to classify new opened documents. */ @@ -61,7 +62,7 @@ class HelpOnStartup : private ThreadHelpBase //....................................... /** @short is needed to locate a might open help frame. */ - css::uno::Reference< css::frame::XFrame > m_xDesktop; + css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; //....................................... /** @short provides read access to the underlying configuration. */ @@ -86,11 +87,11 @@ class HelpOnStartup : private ThreadHelpBase //--------------------------------------- /** @short create new instance of this class. - @param xSMGR + @param xContext reference to the uno service manager, which created this instance. Can be used later to create own needed uno resources on demand. */ - HelpOnStartup(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext); //--------------------------------------- /** @short does nothing real ... diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index cd03bff7c824..7f18dc69a18f 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/task/XJobListener.hpp> #include <com/sun/star/util/XCloseListener.hpp> @@ -128,7 +128,7 @@ class Job : public css::lang::XTypeProvider We are registered at this instance to listen for office shutdown events. It's neccessary supress it (if possible) or to react in the right way. */ - css::uno::Reference< css::frame::XDesktop > m_xDesktop; + css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; /** A job can return a dispatch result event after finishing its work. diff --git a/framework/inc/services.h b/framework/inc/services.h index 6606328fcab5..e3131365e2ec 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -29,7 +29,6 @@ namespace framework{ //_________________________________________________________________________________________________________________ #define SERVICENAME_FRAME DECLARE_ASCII("com.sun.star.frame.Frame" ) -#define SERVICENAME_DESKTOP DECLARE_ASCII("com.sun.star.frame.Desktop" ) #define SERVICENAME_TASK DECLARE_ASCII("com.sun.star.frame.Task" ) #define SERVICENAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.frame.FrameLoaderFactory" ) #define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" ) diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 0f5c65d1a3f9..d6d2aaea260f 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/WindowArrange.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -47,7 +47,6 @@ #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/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/frame/XTasksSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -107,12 +106,8 @@ enum ELoadState class Desktop : // interfaces public css::lang::XTypeProvider , public css::lang::XServiceInfo , - public css::frame::XDesktop , - public css::frame::XComponentLoader , + public css::frame::XDesktop2 , public css::frame::XTasksSupplier , - public css::frame::XDispatchProvider , - public css::frame::XDispatchProviderInterception, - public css::frame::XFramesSupplier , // => XFrame => XComponent public css::frame::XDispatchResultListener , // => XEventListener public css::task::XInteractionHandler , public css::frame::XUntitledNumbers , |