[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 10 03:32:05 PST 2012


 connectivity/source/manager/mdrivermanager.hxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b05c792ffe408b9769de6e39d5ebd39749211f6b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 10 12:31:37 2012 +0100

    Fix previous commit

diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 87b145d..9f78ec9 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -24,10 +24,9 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/logging.hxx>
 #include <comphelper/componentcontext.hxx>
@@ -54,8 +53,7 @@ namespace drivermanager
     //==========================================================================
     //= OSDBCDriverManager - the one-instance service for managing SDBC drivers
     //==========================================================================
-    typedef ::cppu::WeakImplHelper4 <   ::com::sun::star::sdbc::XDriverManager2
-                                    ,   ::com::sun::star::sdbc::XDriverAccess
+    typedef ::cppu::WeakImplHelper3 <   ::com::sun::star::sdbc::XDriverManager2
                                     ,   ::com::sun::star::lang::XServiceInfo
                                     ,   ::com::sun::star::uno::XNamingService
                                     >   OSDBCDriverManager_Base;


More information about the Libreoffice-commits mailing list