diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-02-22 23:48:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-02-23 00:02:48 +0100 |
| commit | 23e52c207760c596cc2f841ef59f3100c110d591 (patch) | |
| tree | 9d7b0240b53f4b2541ad54c8f02b17287892c07f /sw | |
| parent | vcl: crash in GraphiteLayout::expandOrCondense: (diff) | |
| download | core-23e52c207760c596cc2f841ef59f3100c110d591.tar.gz core-23e52c207760c596cc2f841ef59f3100c110d591.zip | |
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))
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/docnode/ndcopy.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 07bf4a4f2024..24615052be10 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -1431,7 +1431,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; |