From 2d5231041203f2471c4d2f052dde6f4808fa8344 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 22 Feb 2012 23:58:04 +0100 Subject: fdo#46482: prevent duplication of frames: SwDoc::MakeFlySection: abuse the SwDoc::mbRedlineMove flag, which (with the fix for fdo#40599) does exactly what is necessary to prevent the spurious copies. Also, remove the ugly hack to work around this problem from SwXText::convertToTextFrame. (cherry picked from commit 91fab30f3b1617024ee2eadf3c7ad1ea84d7f6dd) --- sw/source/core/unocore/unotext.cxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sw/source/core/unocore') diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index a562a252d264..71939e4a5159 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1720,12 +1720,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SwFmtAnchor aAnchor((*i)->GetAnchor()); aAnchor.SetAnchor(aMovePam.Start()); m_pImpl->m_pDoc->SetAttr(aAnchor, *(*i)); - - // delete the old anchor - SwSpzFrmFmts* pFrmFmts = m_pImpl->m_pDoc->GetSpzFrmFmts(); - // here we rely on that fact that this is a sorted list, where the last element is the newly created frame - SwFrmFmt *pFrmFmt = (*pFrmFmts)[pFrmFmts->Count()-1]; - m_pImpl->m_pDoc->DelLayoutFmt(pFrmFmt); } } } -- cgit v1.2.3