diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-29 08:09:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-03 09:59:59 +0200 |
| commit | 30dd9b2ff564e90a415603694b07b6c43491787c (patch) | |
| tree | c077f4e07c43da0c56924b1af2e9d1d0a6b0026c /framework | |
| parent | a8a35e54f506ae22a0ac8f80aa824813260de000 (diff) | |
fdo#46808, Convert SfxFrameLoader service to new style
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services.h | 1 | ||||
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index 24503d4041ee..6b35bf2da568 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -59,7 +59,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" ) #define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" ) -#define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" ) #define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper") #define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" ) #define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" ) diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index b8a584092982..577973677b33 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -52,6 +52,7 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/OfficeFrameLoader.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrameLoader.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> @@ -1194,7 +1195,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() { try { - return m_xContext->getServiceManager()->createInstanceWithContext(IMPLEMENTATIONNAME_GENERICFRAMELOADER, m_xContext); + return css::frame::OfficeFrameLoader::create(m_xContext); } catch(const css::uno::RuntimeException&) { throw; } |