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 6db39dbd)

Change-Id: I711d32a81519edd6840cc29f5cd9dbc57ef21982

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())
     {

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);
+                    }
                 }
             }