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

4 files changed, 14 insertions, 35 deletions

diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index 2fb1aafb89c2..c774ea674f2f 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -21,20 +21,16 @@
 #ifndef __com_sun_star_scanner_ScannerManager_idl__
 #define __com_sun_star_scanner_ScannerManager_idl__
 
-#include <com/sun/star/scanner/XScannerManager.idl>
+#include <com/sun/star/scanner/XScannerManager2.idl>
 
 
 
 module com { module sun { module star { module scanner {
 
-// DOCUMENTATION CHANGED FOR ScannerManager
 /** ScannerManager provides a simple method to access scanner devices
     (or other image producing devices)
-
-    Note that implementations should actually implement
-    <type>XScannerManager2</type>.
 */
-published service ScannerManager : XScannerManager;
+published service ScannerManager : XScannerManager2;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/scanner/XScannerManager2.idl b/offapi/com/sun/star/scanner/XScannerManager2.idl
index 2c5c321e271b..e1b6080bf573 100644
--- a/offapi/com/sun/star/scanner/XScannerManager2.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager2.idl
@@ -30,7 +30,7 @@
 #ifndef __com_sun_star_scanner_XScannerManager2_idl__
 #define __com_sun_star_scanner_XScannerManager2_idl__
 
-#include <com/sun/star/scanner/ScannerManager.idl>
+#include <com/sun/star/scanner/XScannerManager.idl>
 
 
 module com { module sun { module star { module scanner {
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 5ecde162c967..1a0443e7e468 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -19,6 +19,7 @@
 
 
 #include "DrawViewShell.hxx"
+#include <com/sun/star/scanner/ScannerManager.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/processfactory.hxx>
 #ifndef _SVX_SIZEITEM
@@ -81,7 +82,7 @@ sal_Bool DrawViewShell::mbPipette = sal_False;
 // - ScannerEventListener -
 // ------------------------
 
-class ScannerEventListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+class ScannerEventListener : public ::cppu::WeakImplHelper1< lang::XEventListener >
 {
 private:
 
@@ -93,7 +94,7 @@ public:
                             ~ScannerEventListener();
 
     // XEventListener
-    virtual void SAL_CALL   disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException);
 
     void                    ParentDestroyed() { mpParent = NULL; }
 };
@@ -106,7 +107,7 @@ ScannerEventListener::~ScannerEventListener()
 
 // -----------------------------------------------------------------------------
 
-void SAL_CALL ScannerEventListener::disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException)
 {
     if( mpParent )
         mpParent->ScannerEvent( rEventObject );
@@ -356,21 +357,13 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
 
     mnLockCount = 0UL;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+    uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
 
-    if( xMgr.is() )
-    {
-        mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 >(
-                           xMgr->createInstance( "com.sun.star.scanner.ScannerManager" ),
-                           ::com::sun::star::uno::UNO_QUERY );
+    mxScannerManager = scanner::ScannerManager::create( xContext );
 
-        if( mxScannerManager.is() )
-        {
-            mxScannerListener = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >(
-                                static_cast< ::cppu::OWeakObject* >( new ScannerEventListener( this ) ),
-                                ::com::sun::star::uno::UNO_QUERY );
-        }
-    }
+    mxScannerListener = uno::Reference< lang::XEventListener >(
+                        static_cast< ::cppu::OWeakObject* >( new ScannerEventListener( this ) ),
+                        uno::UNO_QUERY );
 
     mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) );
     mpViewOverlayManager.reset( new ViewOverlayManager( GetViewShellBase() ) );
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;
 }