diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-10 16:10:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-10 16:14:56 +0200 |
| commit | b56558717d8b5291e5f547e3fd2cf21d33efe08e (patch) | |
| tree | 030ebc538e622176008478df7c994a89fd5d2ab8 | |
| parent | a34a8fca21c670c4e7ee147d05ed9e6e4136cbe1 (diff) | |
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
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/section.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index dcbfc1cecd94..41ac05e90cc5 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 683c2d27976e..175531229fd8 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); + } } } |