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

[Caolán McNamara (via logerrit)]

 cppu/source/uno/lbmap.cxx       |    2 +-
 cui/source/options/optlingu.cxx |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit c5d512203e1a63a9686f7b648a6e4ae9354ba314
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 28 09:23:20 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 28 13:38:40 2023 +0200

    cid#1546008 silence Using invalid iterator
    
    Change-Id: I76043da245d47d10993361235425f48b7f6d4034
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157359
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index cbf613784ee4..04e4c28eee4c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -715,7 +715,7 @@ void SAL_CALL uno_revokeMapping(
     ClearableMutexGuard aGuard( rData.aMappingsMutex );
 
     const t_Mapping2Entry::const_iterator iFind( rData.aMapping2Entry.find( 
pMapping ) );
-    OSL_ASSERT( iFind != rData.aMapping2Entry.end() );
+    assert(iFind != rData.aMapping2Entry.end() && "pMapping must be registered 
to be removed");
     MappingEntry * pEntry = (*iFind).second;
     if (! --pEntry->nRef)
     {
commit 77d1affc868b137db0ba2c5db431fa99e6d1ad51
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 28 09:07:18 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 28 13:38:33 2023 +0200

    cid#1545248 COPY_INSTEAD_OF_MOVE
    
    Change-Id: I67cb6bbebeecb595f68b0a70c7416e6aaa56399f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157358
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 1fda06663fa8..4246b607d2d0 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1020,12 +1020,8 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
                 if (LinguMgr::GetIgnoreAllList() == xDic)
                     bChecked = true;
                 xDic->setActive( bChecked );
-
                 if (bChecked)
-                {
-                    OUString aDicName( xDic->getName() );
-                    pActiveDic[ nActiveDics++ ] = aDicName;
-                }
+                    pActiveDic[nActiveDics++] = xDic->getName();
             }
         }
     }