core.git: writerperfect/source

[Caolán McNamara (via logerrit)]

 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f4a3ffe1110aa38a3836533e6c51b910c68c2336
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jan 3 15:14:12 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 3 21:59:06 2025 +0100

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

diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx 
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 82e4348f7ad8..314cb22af52a 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -122,7 +122,11 @@ public:
     /** return a new stream for an OLE zone */
     librevenge::RVNGInputStream* getSubStreamByName(const char* name) override
     {
-        if (!m_nameToPathMap.contains(name) || !m_xContent.is())
+        if (!m_xContent.is())
+            return nullptr;
+
+        auto aIter = m_nameToPathMap.find(name);
+        if (aIter == m_nameToPathMap.end())
             return nullptr;
 
         try
@@ -133,7 +137,7 @@ public:
                 const uno::Reference<ucb::XContentAccess> 
xContentAccess(xResultSet,
                                                                          
uno::UNO_QUERY_THROW);
                 const uno::Reference<sdbc::XRow> xRow(xResultSet, 
uno::UNO_QUERY_THROW);
-                OUString lPath = m_nameToPathMap.find(name)->second;
+                OUString lPath = aIter->second;
                 do
                 {
                     const OUString aTitle(xRow->getString(1));