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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/core/recovery/subcomponentrecovery.cxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 305379cb3e45..e54299448a49 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XTransactionBroadcaster.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XOutputStream.hpp> @@ -2078,7 +2079,7 @@ Reference< XTitle > ODatabaseDocument::impl_getTitleHelper_throw() uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHelper_throw(const uno::Reference< uno::XInterface >& _xComponent) { if ( !m_xModuleManager.is() ) - m_xModuleManager.set( m_pImpl->m_aContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW ); + m_xModuleManager.set( ModuleManager::create(m_pImpl->m_aContext.getUNOContext()), UNO_QUERY_THROW ); ::rtl::OUString sModuleId; try diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 0c962b62b8e1..d9129d18644b 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -26,7 +26,7 @@ #include "settingsimport.hxx" #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> @@ -61,7 +61,8 @@ namespace dbaccess using ::com::sun::star::embed::XStorage; using ::com::sun::star::sdb::application::XDatabaseDocumentUI; using ::com::sun::star::beans::Pair; - using ::com::sun::star::frame::XModuleManager; + using ::com::sun::star::frame::ModuleManager; + using ::com::sun::star::frame::XModuleManager2; using ::com::sun::star::lang::XComponent; using ::com::sun::star::frame::XModel; using ::com::sun::star::frame::XController; @@ -480,7 +481,7 @@ namespace dbaccess m_aCompDesc.sName = aComponentIdentity.Second; // what the controller didn't give us is the information whether this is in edit mode or not ... - Reference< XModuleManager > xModuleManager( m_rContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW ); + Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext.getUNOContext()) ); const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); switch ( m_eType ) |