[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source

[Julien Nabet (via logerrit)]

 compilerplugins/clang/mergeclasses.results       |    2 +-
 connectivity/source/drivers/odbc/ORealDriver.cxx |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5568023a716b945fa3e1398859ee9682b8f71a9a
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Jan 25 18:23:11 2020 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Jan 25 21:58:39 2020 +0100

    Typo ORealObdcDriver->ORealOdbcDriver
    
    Thank you Terrence Enger for having spotted this!
    
    Change-Id: I234ded85edf837e398675427fdf3e9cd3a3969a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87417
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 3f7408a2fe60..3e084ce65dea 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -241,7 +241,7 @@ merge connectivity::file::OStatement_Base with connectivity::file::OStatement_BA
 merge connectivity::hsqldb::IMethodGuardAccess with connectivity::hsqldb::OHsqlConnection
 merge connectivity::java_lang_Exception with connectivity::java_sql_SQLException_BASE
 merge connectivity::java_sql_Statement_Base with connectivity::OStatement_BASE2
-merge connectivity::odbc::ODBCDriver with connectivity::odbc::(anonymous namespace)::ORealObdcDriver
+merge connectivity::odbc::ODBCDriver with connectivity::odbc::(anonymous namespace)::ORealOdbcDriver
 merge connectivity::odbc::OStatement_Base with connectivity::odbc::OStatement_BASE2
 merge connectivity::sdbcx::IObjectCollection with (anonymous namespace)::OHardRefMap
 merge connectivity::sdbcx::OKey with connectivity::OTableKeyHelper
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 4654a150d793..f6432dbf57cf 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -26,18 +26,18 @@ namespace connectivity::odbc
     {
         namespace {
 
-        class ORealObdcDriver : public ODBCDriver
+        class ORealOdbcDriver : public ODBCDriver
         {
         protected:
             virtual oslGenericFunction  getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const override;
             virtual SQLHANDLE   EnvironmentHandle(OUString &_rPath) override;
         public:
-            explicit ORealObdcDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {}
+            explicit ORealOdbcDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {}
         };
 
         }
 
-oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
+oslGenericFunction ORealOdbcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
 {
     oslGenericFunction pFunction = nullptr;
     switch(_nIndex)
@@ -261,11 +261,11 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex)
 
 css::uno::Reference< css::uno::XInterface > ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
-    return *(new ORealObdcDriver(_rxFactory));
+    return *(new ORealOdbcDriver(_rxFactory));
 }
 
 // ODBC Environment (common for all Connections):
-SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath)
+SQLHANDLE ORealOdbcDriver::EnvironmentHandle(OUString &_rPath)
 {
     // Is (for this instance) already an Environment made?
     if (!m_pDriverHandle)