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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 58e026ff5979..5b493ec43397 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -64,7 +64,7 @@ #include "com/sun/star/awt/XDevice.hpp" #include "com/sun/star/util/MeasureUnit.hpp" #include "com/sun/star/frame/XModel.hpp" -#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/ModuleManager.hpp" #include "com/sun/star/frame/XStorable.hpp" #include "com/sun/star/frame/XController.hpp" #include "com/sun/star/document/XDocumentProperties.hpp" @@ -317,10 +317,8 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >& OUString aDocMimetype; // get document service name Reference< com::sun::star::frame::XStorable > xStore( xDoc, UNO_QUERY ); - Reference< frame::XModuleManager > xModuleManager( - xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ) ) ), - uno::UNO_QUERY ); - if( xModuleManager.is() && xStore.is() ) + Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(comphelper::getComponentContext( xFactory )) ); + if( xStore.is() ) { OUString aDocServiceName = xModuleManager->identify( Reference< XInterface >( xStore, uno::UNO_QUERY ) ); if ( !aDocServiceName.isEmpty() ) |