[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet (via logerrit)]

 dbaccess/source/core/dataaccess/SharedConnection.hxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 4f48baedb56589d46ec978ce897d8104b8c216d8
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Oct 18 09:54:00 2023 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Oct 18 11:54:22 2023 +0200

    Replace useless typedef OSharedConnection_BASE2 and replace it by its value
    
    Change-Id: I660813058077a36bcf80a3128b53767c851c2672
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158105
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx 
b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index ea6e961cf19d..2c88e58fd55d 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -34,11 +34,10 @@ namespace dbaccess
     // datasource is asked for not isolated connection.
     typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection
                                            > OSharedConnection_BASE;
-    typedef ::connectivity::OConnectionWrapper  OSharedConnection_BASE2;
 
     class OSharedConnection :   public ::cppu::BaseMutex
                               , public OSharedConnection_BASE
-                              , public OSharedConnection_BASE2
+                              , public ::connectivity::OConnectionWrapper
     {
     protected:
         virtual void SAL_CALL disposing() override;
@@ -54,7 +53,7 @@ namespace dbaccess
         {
             return ::comphelper::concatSequences(
                 OSharedConnection_BASE::getTypes(),
-                OSharedConnection_BASE2::getTypes()
+                ::connectivity::OConnectionWrapper::getTypes()
             );
         }
 
@@ -62,7 +61,7 @@ namespace dbaccess
         {
             css::uno::Any aReturn = 
OSharedConnection_BASE::queryInterface(_rType);
             if ( !aReturn.hasValue() )
-                aReturn = OSharedConnection_BASE2::queryInterface(_rType);
+                aReturn = 
::connectivity::OConnectionWrapper::queryInterface(_rType);
             return aReturn;
         }