summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-22 23:48:57 +0100
committerPetr Mladek <pmladek@suse.cz>2012-02-24 15:20:30 +0100
commiteda71e73a401458acdb58a26841791de1d23c2c5 (patch)
tree46a579cbeb34c2633bf63fed0c8662476af69585
parentca76395eead22525d9c1a3a3b0863189b911ed1c (diff)
fdo#40599 i#112763: fix frame duplication:
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 <caolanm@redhat.com>
-rw-r--r--sw/source/core/docnode/ndcopy.cxx2
1 files changed, 1 insertions, 1 deletions
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;