[Libreoffice-commits] core.git: 3 commits - editeng/source sc/source sw/source

[Caolán McNamara (via logerrit)]

 editeng/source/misc/svxacorr.cxx            |   11 +++++++----
 sc/source/filter/excel/xeescher.cxx         |    2 +-
 sw/source/uibase/shells/translatehelper.cxx |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 004807caaa5f5e4516ba5cc9fac085fe8cd30dee
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Dec 1 11:50:19 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 1 18:06:54 2023 +0100

    cid#1546413 silence Using invalid iterator
    
    sample to test silencing this
    
    Change-Id: I73a8e22a5266367d7b2c76aa00d38d40431b4841
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160213
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4c4b6883f247..ab8a43091b00 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1888,11 +1888,14 @@ bool SvxAutoCorrect::PutText( const OUString& rShort, 
const OUString& rLong,
                                 LanguageType eLang )
 {
     LanguageTag aLanguageTag( eLang);
-    auto const iter = m_aLangTable.find(aLanguageTag);
-    if (iter != m_aLangTable.end())
+    if (auto const iter = m_aLangTable.find(aLanguageTag); iter != 
m_aLangTable.end())
         return iter->second.PutText(rShort, rLong);
-    if(CreateLanguageFile(aLanguageTag))
-        return m_aLangTable.find(aLanguageTag)->second.PutText(rShort, rLong);
+    if (CreateLanguageFile(aLanguageTag))
+    {
+        auto const iter = m_aLangTable.find(aLanguageTag);
+        assert (iter != m_aLangTable.end());
+        return iter->second.PutText(rShort, rLong);
+    }
     return false;
 }
 
commit fc288036a51f3d6a529ef4f145468f3ee3c8fc32
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Dec 1 11:45:07 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 1 18:06:46 2023 +0100

    cid#1555476 silence Unchecked return value
    
    Change-Id: I55db6a470a2aca5ebcbace7859236b08bb67e25b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160212
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index 4ed990be33d3..c85089fc0736 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1566,7 +1566,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& 
rObjMgr, Reference< XShape
 
     // load the chart OLE object
     if( SdrOle2Obj* pSdrOleObj = dynamic_cast< SdrOle2Obj* >( pSdrObj ) )
-        svt::EmbeddedObjectRef::TryRunningState( pSdrOleObj->GetObjRef() );
+        (void)svt::EmbeddedObjectRef::TryRunningState(pSdrOleObj->GetObjRef());
 
     // create the chart substream object
     ScfPropertySet aShapeProp( xShape );
commit e0014555f562feb1096dc80b1350e2b881ca2a9e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Dec 1 11:43:40 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 1 18:06:40 2023 +0100

    cid#1558172 Division or modulo by zero
    
    Change-Id: I4060b003fc03c8fe3e0396f9618e64a69715131c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160211
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/shells/translatehelper.cxx 
b/sw/source/uibase/shells/translatehelper.cxx
index a3d03542ba5a..eb9bcaedbb05 100644
--- a/sw/source/uibase/shells/translatehelper.cxx
+++ b/sw/source/uibase/shells/translatehelper.cxx
@@ -193,7 +193,7 @@ void TranslateDocumentCancellable(SwWrtShell& rWrtSh, const 
TranslateAPIConfig&
                 rConfig.m_xTargetLanguage, rConfig.m_xAPIUrl, 
rConfig.m_xAuthKey, aOut);
             SwTranslateHelper::PasteHTMLToPaM(rWrtSh, cursor.get(), 
aTranslatedOut);
 
-            if (xStatusIndicator.is())
+            if (xStatusIndicator.is() && nCount)
                 xStatusIndicator->setValue((100 * ++nProgress) / nCount);
 
             Idle aIdle("ProgressBar::SetValue aIdle");