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

[Andrea Gelmini (via logerrit)]

 dbaccess/source/core/dataaccess/datasource.cxx |    2 +-
 dbaccess/source/core/inc/ModelImpl.hxx         |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c2c7a802e58527a5e572e903a206fe0be6c34172
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Apr 28 21:11:21 2019 +0000
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu May 2 19:49:50 2019 +0200

    Fix typo
    
    Change-Id: Ic1cf0caad8f29efc24b6d78fd784d19ed7f113db
    Reviewed-on: https://gerrit.libreoffice.org/71693
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 0935fcf77bb5..dc8a786f75cd 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1177,7 +1177,7 @@ Reference< XConnection > ODatabaseSource::connectWithCompletion( const Reference
         {
             m_pImpl->m_sFailedPassword = m_pImpl->m_aPassword;
             // assume that we had an authentication problem. Without this we may, after an unsuccessful connect, while
-            // the user gave us a password an the order to remember it, never allow an password input again (at least
+            // the user gave us a password and the order to remember it, never allow a password input again (at least
             // not without restarting the session)
             m_pImpl->m_aPassword.clear();
         }
commit fc66bc369c195de7f12f3f657120de72b145c32d
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Apr 28 21:11:20 2019 +0000
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu May 2 19:49:11 2019 +0200

    Fix typo
    
    Change-Id: Ia2f869a5a71c080d6284bc3a705ee4551195d9f5
    Reviewed-on: https://gerrit.libreoffice.org/71694
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx
index 0771f07b6194..15cda7443bbd 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -344,7 +344,7 @@ public:
 
     void release();
 
-    /// returns a all known data source settings, including their default values
+    /// returns all known data source settings, including their default values
     static const AsciiPropertyValue* getDefaultDataSourceSettings();
 
     /** retrieves the requested container of objects (forms/reports/tables/queries)
@@ -461,7 +461,7 @@ private:
 
 };
 
-/** a small base class for UNO components whose functionality depends on a ODatabaseModelImpl
+/** a small base class for UNO components whose functionality depends on an ODatabaseModelImpl
 */
 class ModelDependentComponent
 {
@@ -519,7 +519,7 @@ private:
     ModelDependentComponent&    m_rComponent;
 };
 
-/** a guard for public methods of objects dependent on a ODatabaseModelImpl instance
+/** a guard for public methods of objects dependent on an ODatabaseModelImpl instance
 
     Just put this guard onto the stack at the beginning of your method. Don't bother yourself
     with a MutexGuard, checks for being disposed, and the like.
@@ -534,7 +534,7 @@ public:
     /** constructs the guard
 
         @param _component
-            the component whose functionality depends on a ODatabaseModelImpl instance
+            the component whose functionality depends on an ODatabaseModelImpl instance
 
         @throws css::lang::DisposedException
             If the given component is already disposed