[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/ndtbl.cxx |    4 ++--
 sw/source/core/undo/untbl.cxx    |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f30e4981248f1ebc37728f5848773f730f14ea56
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 10 17:30:58 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Jun 11 13:22:11 2020 +0200

    sw: follow-up: fix other calls of ContentIdxStore::Save(Len())
    
    Presumably these have the same bug as sw_JoinText().
    
    Change-Id: I77a794be92f36cf2163f819d3941d70e69eb2f27
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96057
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 3e36cfcabc81..2cde2f38f190 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1065,7 +1065,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
         SwPosition aCntPos( aSttIdx, SwIndex( pTextNd ));
 
         const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
-        pContentStore->Save( pDoc, aSttIdx.GetIndex(), pTextNd->GetText().getLength() );
+        pContentStore->Save(pDoc, aSttIdx.GetIndex(), SAL_MAX_INT32);
 
         if( T2T_PARA != cCh )
         {
@@ -1564,7 +1564,7 @@ static void lcl_DelBox( SwTableBox* pBox, DelTabPara* pDelPara )
 
                 const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
                 const sal_Int32 nOldTextLen = aCntIdx.GetIndex();
-                pContentStore->Save( pDoc, nNdIdx, pCurTextNd->GetText().getLength() );
+                pContentStore->Save(pDoc, nNdIdx, SAL_MAX_INT32);
 
                 pDelPara->pLastNd->JoinNext();
 
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1cbf5c1bdad3..8cbf571b39e9 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -576,7 +576,9 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
         {
             pContentStore->Clear();
             if( pTextNd )
-                pContentStore->Save( GetDoc(), aSttIdx.GetIndex(), pTextNd->GetText().getLength() );
+            {
+                pContentStore->Save(GetDoc(), aSttIdx.GetIndex(), SAL_MAX_INT32);
+            }
         }
 
         if( pTextNd )