core.git: svx/source sw/source

[Caolán McNamara (via logerrit)]

 svx/source/form/fmshimp.cxx        |    2 +-
 sw/source/core/layout/paintfrm.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cf3dda7c1c1da50db75d4c022bef279149d26636
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 9 19:28:18 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 9 21:59:57 2023 +0100

    cid#1546275 Using invalid iterator
    
    and
    
    cid#1545870 Using invalid iterator
    
    Change-Id: I7a517fd67d1100a2feebfd3903c1804a2dcc2992
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160514
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d54c5acaebde..890394856688 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3372,7 +3372,7 @@ void FmXFormShell::CreateExternalView_Lock()
 
                 // list source
                 MapUString2UstringSeq::const_iterator aCurrentListSource = 
aRadioListSources.find(rCtrlSource.first);
-                DBG_ASSERT(aCurrentListSource != aRadioListSources.end(),
+                assert(aCurrentListSource != aRadioListSources.end() &&
                     "FmXFormShell::CreateExternalView : inconsistent radio 
descriptions !");
                 pListBoxDescription->Name = FM_PROP_LISTSOURCE;
                 pListBoxDescription->Value <<= (*aCurrentListSource).second;
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 0f048c4e805d..8ca5e35d1c84 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2746,8 +2746,8 @@ void SwTabFramePainter::FindStylesForLine( Point& 
rStartPoint,
     }
 
     aMapIter = maHoriLines.find( rStartPoint.Y() );
-    OSL_ENSURE( aMapIter != maHoriLines.end(), "FindStylesForLine: Error" );
-    const SwLineEntrySet& rHoriSet = (*aMapIter).second;
+    assert(aMapIter != maHoriLines.end() && "FindStylesForLine: Error");
+    const SwLineEntrySet& rHoriSet = aMapIter->second;
 
     for ( const SwLineEntry& rEntry : rHoriSet )
     {