[Libreoffice-commits] core.git: 2 commits - basctl/source comphelper/source include/comphelper

[Andrea Gelmini (via logerrit)]

 basctl/source/basicide/localizationmgr.cxx              |    8 ++++----
 comphelper/source/container/embeddedobjectcontainer.cxx |    4 ++--
 include/comphelper/embeddedobjectcontainer.hxx          |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 39078750d7719cf15d7a4c4a3e875a7e0ff52b77
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 12:50:20 2020 +0200
Commit:     Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Mon Aug 31 13:08:57 2020 +0200

    Fix typo in code
    
    It passed "make check on Linux"
    
    Change-Id: I53b40e36c6b1c0aa115044208b5a372fb101347b

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 6056cafd4c63..6adb91987455 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1430,7 +1430,7 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen
     return xInStream;
 }
 
-bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag)
+bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifiedFlag)
 {
     bool bError = false;
     const uno::Sequence < OUString > aNames = GetObjectNames();
@@ -1461,7 +1461,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::
                     break;
                 }
             }
-            if ( _bClearModifedFlag )
+            if ( _bClearModifiedFlag )
             {
                 // if this method is used as part of SaveCompleted the object must stay unmodified after execution
                 try
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 130a6a1ad031..c477a6fbe8c2 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -176,10 +176,10 @@ public:
     /** call setPersistentEntry for each embedded object in the container
     *
     * \param _xStorage The storage where to store the objects.
-    * \param _bClearModifedFlag If <TRUE/> then the modified flag will be set to <FALSE/> otherwise nothing happen.
+    * \param _bClearModifiedFlag If <TRUE/> then the modified flag will be set to <FALSE/> otherwise nothing happen.
     * \return <FALSE/> if no error occurred, otherwise <TRUE/>.
     */
-    bool             SetPersistentEntries(const css::uno::Reference< css::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true);
+    bool             SetPersistentEntries(const css::uno::Reference< css::embed::XStorage >& _xStorage,bool _bClearModifiedFlag = true);
 
     bool getUserAllowsLinkUpdate() const;
     void setUserAllowsLinkUpdate(bool bNew);
commit 43cc37e6953840ec337125e30e1de398bd36f69d
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 12:45:29 2020 +0200
Commit:     Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Mon Aug 31 13:08:57 2020 +0200

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: I2dc3d343058b6d77da30561ec4f62bdd292630dc

diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index f7783efb6b1d..c8a393440094 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -658,7 +658,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< Locale >& aLocaleSeq
 {
     const Locale* pLocales = aLocaleSeq.getConstArray();
     sal_Int32 nLocaleCount = aLocaleSeq.getLength();
-    bool bConsistant = true;
+    bool bConsistent = true;
     bool bModified = false;
 
     for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ )
@@ -678,7 +678,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< Locale >& aLocaleSeq
             else
             {
                 // Inconsistency, keep last locale
-                bConsistant = false;
+                bConsistent = false;
                 bRemove = false;
             }
         }
@@ -692,7 +692,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< Locale >& aLocaleSeq
             }
             catch(const IllegalArgumentException&)
             {
-                bConsistant = false;
+                bConsistent = false;
             }
         }
     }
@@ -710,7 +710,7 @@ void LocalizationMgr::handleRemoveLocales( const Sequence< Locale >& aLocaleSeq
         handleTranslationbar();
     }
 
-    DBG_ASSERT( bConsistant,
+    DBG_ASSERT( bConsistent,
         "LocalizationMgr::handleRemoveLocales(): sequence contains unsupported locales" );
 }