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 /svx | |
| parent | Quick and dirty adaption of ModuleManager to WeakImplHelper (diff) | |
| download | core-1c7a54e3a14ad932e68b9281420e6c469e5dd2e5.tar.gz core-1c7a54e3a14ad932e68b9281420e6c469e5dd2e5.zip | |
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 'svx')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 8dd903e8d5eb..24bbe33a3947 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <comphelper/processfactory.hxx> #include <svl/itempool.hxx> #include <svl/intitem.hxx> @@ -711,22 +711,17 @@ void SvxSearchDialog::CalculateDelta_Impl() bool bWriterApp = false; bool bImpressApp = false; const uno::Reference< frame::XFrame > xFrame = rBindings.GetActiveFrame(); - uno::Reference< frame::XModuleManager > xModuleManager( - ::comphelper::getProcessServiceFactory()->createInstance( - DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), uno::UNO_QUERY ); - if ( xModuleManager.is() ) + uno::Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(::comphelper::getProcessComponentContext()) ); + try + { + ::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame ); + bCalcApp = aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument"; + bDrawApp = aModuleIdentifier == "com.sun.star.drawing.DrawingDocument"; + bImpressApp = aModuleIdentifier == "com.sun.star.presentation.PresentationDocument"; + bWriterApp = aModuleIdentifier == "com.sun.star.text.TextDocument"; + } + catch ( uno::Exception& ) { - try - { - ::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame ); - bCalcApp = aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument"; - bDrawApp = aModuleIdentifier == "com.sun.star.drawing.DrawingDocument"; - bImpressApp = aModuleIdentifier == "com.sun.star.presentation.PresentationDocument"; - bWriterApp = aModuleIdentifier == "com.sun.star.text.TextDocument"; - } - catch ( uno::Exception& ) - { - } } if ( pImpl->bDeltaCalculated ) |