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

[Michael Stahl]

 sw/source/core/doc/doccomp.cxx     |    2 +-
 sw/source/core/docnode/section.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b56558717d8b5291e5f547e3fd2cf21d33efe08e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 10 16:10:45 2014 +0200

    fdo#83655: sw: RSID-only hint assertion when inserting in master document
    
    For the temporary document there is no layout so SwTxtNode::MakeFrm()
    isn't called.
    
    (regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291)
    
    Change-Id: I711d32a81519edd6840cc29f5cd9dbc57ef21982

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index dcbfc1c..41ac05e 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1760,7 +1760,7 @@ void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo )
     }
 }
 
-static bool lcl_MergePortions(SwNode *const& pNode, void *)
+bool lcl_MergePortions(SwNode *const& pNode, void *)
 {
     if (pNode->IsTxtNode())
     {
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 683c2d2..1755312 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1270,6 +1270,11 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
                     SwDoc* pSrcDoc = ((SwDocShell*)&xDocSh)->GetDoc();
                     eOldRedlineMode = pSrcDoc->getIDocumentRedlineAccess().GetRedlineMode();
                     pSrcDoc->getIDocumentRedlineAccess().SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_INSERT );
+                    if (2 == nRet)
+                    {
+                        bool lcl_MergePortions(SwNode *const& pNode, void *);
+                        pSrcDoc->GetNodes().ForEach(&lcl_MergePortions);
+                    }
                 }
             }