summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-03-08 13:46:53 +0200
committerNoel Grandin <noel@peralex.com>2013-03-20 07:32:51 +0200
commit51a2b574bf6e163d34d2301c2b526a09cd7ff1aa (patch)
tree0b439be2e5648318f3a8329758dc0410f4dcd978 /sw
parent3475d91b1ac97d45f6337b9560491f25b3672549 (diff)
fdo#46808, API CHANGE: update ScannerManager service
API CHANGE: The ScannerManager service now returns XScannerManager2 Don't know why this wasn't done already, the service already implements it. Change-Id: I22355749bc859420174a132f3a21cc7a4984bf5f
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/app/swmodule.cxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 6919cf17fc0a..3002df016bc3 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -52,7 +52,7 @@
#include <svx/extrusioncolorcontrol.hxx>
#include <svx/fontworkgallery.hxx>
#include <svx/modctrl.hxx>
-#include <com/sun/star/scanner/XScannerManager2.hpp>
+#include <com/sun/star/scanner/ScannerManager.hpp>
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/linguistic2/LanguageGuessing.hpp>
#include <comphelper/processfactory.hxx>
@@ -209,17 +209,7 @@ SwModule::GetScannerManager()
{
if (!m_xScannerManager.is())
{
- uno::Reference< lang::XMultiServiceFactory > xMgr (
- comphelper::getProcessServiceFactory() );
- if( xMgr.is() )
- {
- m_xScannerManager =
- uno::Reference< scanner::XScannerManager2 >(
- xMgr->createInstance(
- rtl::OUString(
- "com.sun.star.scanner.ScannerManager") ),
- uno::UNO_QUERY );
- }
+ m_xScannerManager = scanner::ScannerManager::create( comphelper::getProcessComponentContext() );
}
return m_xScannerManager;
}