[Libreoffice-commits] core.git: 2 commits - editeng/source sd/source vcl/source

[Caolán McNamara (via logerrit)]

 editeng/source/misc/svxacorr.cxx         |    4 +++-
 sd/source/filter/eppt/pptx-epptooxml.cxx |    6 +++++-
 vcl/source/window/printdlg.cxx           |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit e507fd525404d5ac078a47650df11e5e18a88a81
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Dec 5 13:54:19 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 5 17:19:03 2023 +0100

    Related: tdf#158534 set fallback help page for optional print content
    
    Change-Id: I79d843cbf2591ab5a8625087e2ec5897b26a8056
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160371
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 3c1f5d0d36e5..9c5f519f7cfb 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1330,6 +1330,7 @@ void PrintDialog::setupOptionalUI()
             rOption.Value >>= sOptionsUIFile;
             mxCustomOptionsUIBuilder = 
Application::CreateBuilder(mxCustom.get(), sOptionsUIFile);
             std::unique_ptr<weld::Container> xWindow = 
mxCustomOptionsUIBuilder->weld_container("box");
+            xWindow->set_help_id("vcl/ui/printdialog/PrintDialog");
             xWindow->show();
             continue;
         }
commit a28a721ef9f2daced3e08f30578e603abd119773
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Dec 5 12:45:43 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 5 17:18:57 2023 +0100

    cid#1546503 Using invalid iterator
    
    and
    
    cid#1546284 Using invalid iterator
    
    Change-Id: I9ff3498b65ce392dbe859566b49e60a31e0779f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160370
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 15cbecc32db3..2788c6694c09 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2146,7 +2146,9 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType 
eLang,
     if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || 
CreateLanguageFile(aLanguageTag, false))
     {
         //the language is available - so bring it on
-        const SvStringsISortDtor* pList = 
m_aLangTable.find(aLanguageTag)->second.GetCplSttExceptList();
+        const auto iter = m_aLangTable.find(aLanguageTag);
+        assert(iter != m_aLangTable.end() && "CreateLanguageFile can't fail");
+        const SvStringsISortDtor* pList = iter->second.GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : 
pList->find(sWord) != pList->end() )
             return true;
     }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ae8ccc063cf2..291565871ff2 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2335,9 +2335,13 @@ void 
PowerPointExport::WritePlaceholderReferenceShapes(PowerPointShapeExport& rD
                 || mXPagePropSet->getPropertyValue("IsDateTimeFixed") == 
false)))
     {
         if ((xShape = GetReferencedPlaceholderXShape(DateAndTime, ePageType)))
+        {
+            const auto iter = maPlaceholderShapeToIndexMap.find(xShape);
+            assert(iter != maPlaceholderShapeToIndexMap.end());
             rDML.WritePlaceholderReferenceShape(DateAndTime,
-                                                
maPlaceholderShapeToIndexMap.find(xShape)->second,
+                                                iter->second,
                                                 ePageType, mXPagePropSet);
+        }
     }
 }