diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-04 14:56:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-05 14:56:19 +0200 |
| commit | 1c7a54e3a14ad932e68b9281420e6c469e5dd2e5 (patch) | |
| tree | 8d2d64a9536e738cc6cda4f0690993c98b658bdd /ucb | |
| parent | 55aa40bcd6ae3116c63a0eac18056bcfd011f43a (diff) | |
fdo#46808, Adapt frame::ModuleManager UNO service to new style
Create a merged XModuleManager2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Explicitly document the XNameReplace interface in the IDL, which
is already implemented by the service, since there is code currently using it.
Change-Id: Ib46349174b1ce495c240031e93c9427fc33d9853
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 6bd7063b178c..c0040cd98693 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -37,6 +37,7 @@ #include "rtl/ref.hxx" #include "cppuhelper/weak.hxx" +#include "comphelper/componentcontext.hxx" #include "comphelper/namedvaluecollection.hxx" #include "comphelper/documentinfo.hxx" @@ -45,6 +46,7 @@ #include "com/sun/star/container/XEnumerationAccess.hpp" #include "com/sun/star/document/XStorageBasedDocument.hpp" #include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/frame/ModuleManager.hpp" #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/util/XCloseBroadcaster.hpp" @@ -700,13 +702,8 @@ bool OfficeDocumentsManager::isBasicIDE( { try { - m_xModuleMgr - = uno::Reference< - frame::XModuleManager >( - m_xSMgr->createInstance( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.ModuleManager" ) ) ), + m_xModuleMgr = uno::Reference< frame::XModuleManager >( + frame::ModuleManager::create(comphelper::ComponentContext(m_xSMgr).getUNOContext()), uno::UNO_QUERY ); } catch ( uno::Exception const & ) |