From ab55f25ecad89e05a440770cfc8c87320ae010ef Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 22 Feb 2012 23:48:57 +0100 Subject: fdo#40599 i#112763: fix frame duplication: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SwDoc::CopyFlyInFlyImpl: When called from SwRedline::CopyToSection, do not copy frames that are anchored at the redline end node by checking IsRedlineMove(); these frames are not deleted by DelCopyOfSection and were thus duplicated on every Show/Hide redlines. (regression from 62ebbb006b4a11974e14dd61d3c453a98336f951 (CWS os131)) (cherry picked from commit 23e52c207760c596cc2f841ef59f3100c110d591) Signed-off-by: Caolán McNamara --- sw/source/core/docnode/ndcopy.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 3ac2c182d0b3..0a823c2507c9 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -1432,7 +1432,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg, bool bAdd = false; if( pAPos->nNode < rRg.aEnd ) bAdd = true; - if( !bAdd ) + if (!bAdd && !IsRedlineMove()) // fdo#40599: not for redline move { bool bEmptyNode = false; bool bLastNode = false; -- cgit v1.2.3