summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-29 08:09:33 +0200
committerNoel Grandin <noel@peralex.com>2013-06-03 09:59:59 +0200
commit30dd9b2ff564e90a415603694b07b6c43491787c (patch)
treec077f4e07c43da0c56924b1af2e9d1d0a6b0026c /sfx2
parenta8a35e54f506ae22a0ac8f80aa824813260de000 (diff)
fdo#46808, Convert SfxFrameLoader service to new style
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/frmload.cxx3
-rw-r--r--sfx2/util/sfx.component1
2 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 03f242bd8b3c..624de0f12398 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -681,8 +681,9 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() th
Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- Sequence< OUString > seqServiceNames( 1 );
+ Sequence< OUString > seqServiceNames( 2 );
seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" );
+ seqServiceNames.getArray() [1] = OUString( "com.sun.star.frame.OfficeFrameLoader" );
return seqServiceNames ;
}
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 05c8c3bbf76e..0de2629eb110 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -38,6 +38,7 @@
</implementation>
<implementation name="com.sun.star.comp.office.FrameLoader">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
+ <service name="com.sun.star.frame.OfficeFrameLoader"/>
</implementation>
<implementation name="com.sun.star.comp.sfx2.AppDispatchProvider">
<service name="com.sun.star.frame.ProtocolHandler"/>