[Libreoffice-commits] .: connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/macab/MacabDriver.cxx |    8 ++++----
 connectivity/source/drivers/macab/MacabDriver.hxx |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 1b718682ade370c06b2d9539084ab889905ab187
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Dec 21 11:23:32 2012 +0200

    Fix MACAB driver for my UNO changes
    
    Change-Id: Ib513a633e3c887f310711c44d4155be4f998a702

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index a2adc78..7365e3d 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -23,7 +23,7 @@
 
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include "resource/macab_res.hrc"
@@ -41,7 +41,7 @@ using namespace connectivity::macab;
 // = MacabImplModule
 // =======================================================================
 // --------------------------------------------------------------------------------
-MacabImplModule::MacabImplModule( const Reference< XMultiServiceFactory >& _rxContext )
+MacabImplModule::MacabImplModule()
     :m_bAttemptedLoadModule(false)
     ,m_hConnectorModule(NULL)
     ,m_pConnectionFactoryFunc(NULL)
@@ -173,7 +173,7 @@ MacabDriver::MacabDriver(
     const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
     : MacabDriver_BASE(m_aMutex),
       m_xContext(_rxContext),
-      m_aImplModule(_rxFactory)
+      m_aImplModule()
 {
     if ( !m_xContext.is() )
         throw NullPointerException();
@@ -181,7 +181,7 @@ MacabDriver::MacabDriver(
     osl_atomic_increment( &m_refCount );
     try
     {
-        Reference< XDesktop2 > xDesktop = frame::Desktop::create( m_xContext );
+        Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext );
         xDesktop->addTerminateListener( this );
     }
     catch( const Exception& )
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index d1d6fe2..2f08b68 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase3.hxx>
 #include <osl/module.h>
 
@@ -122,7 +123,7 @@ namespace connectivity
                                                             //  MacabConnection objects for this Driver
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
                                         m_xContext;       // the multi-service factory
-            MacabImplModule               m_aImplModule;
+            MacabImplModule             m_aImplModule;
 
         public:
             static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception );