[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source translations

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwptablelayout.cxx |    9 ++++++++-
 translations                                  |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9bf58fd45814f10ecf6131aeeec86123a383723f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 27 10:12:37 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 27 14:14:20 2020 +0100

    ofz#26676 null deref
    
    Change-Id: Ic2bd8b49762266ad48263bd68a143b46fb5fd66f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104863
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 2494501ff3d9..ffbd05208d9b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -884,7 +884,14 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
             XFRow* pXFRow = pTmpTable->GetRow(1);
             pXFTable->AddHeaderRow(pXFRow);
             pTmpTable->RemoveRow(1);
-            nContentRow = m_RowsMap[0]->GetCurMaxSpannedRows(0,nCol);
+            auto iter = m_RowsMap.find(0);
+            if (iter == m_RowsMap.end())
+            {
+                SAL_WARN("lwp", "row 0 is unknown");
+                nContentRow = 0;
+            }
+            else
+                nContentRow = iter->second->GetCurMaxSpannedRows(0,nCol);
         }
     }
     return nContentRow;
commit 7accc57517f05ce6b15789cf17d629a1b68a7086
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Oct 27 14:13:40 2020 +0100
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Tue Oct 27 14:13:40 2020 +0100

    Update git submodules
    
    * Update translations from branch 'master'
      to 9e37d57a9ccfcba5925a14f5e29397b2fbf0e261
      - update translations for master / 7.1.0.0 alpha1
    
        and force-fix errors using pocheck
    
        Change-Id: Ic49ef021112516a473dac6df957ca8e4c27d2369

diff --git a/translations b/translations
index a8ebe5d6029f..9e37d57a9ccf 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a8ebe5d6029f6a61ab29ebfbfe331b8646f6ce7d
+Subproject commit 9e37d57a9ccfcba5925a14f5e29397b2fbf0e261