diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-11 17:32:18 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-01-14 10:12:48 +0000 |
| commit | b825f95fa100f2a54032ec5a1ff51de0db17ea1d (patch) | |
| tree | dc33d74a876caf1958b7861fee578d9090a040eb | |
| parent | 553f75a99e45af3f6720c900fbab8207f5e5a392 (diff) | |
fdo#53487 SwUndoInsert: take care of fieldmarks when deleting field chars
The problem was that while SwUndoInsert removed the field characters, it
didn't remove the fieldmark, so after unding a comment insert, it wasn't
possible to re-insert a comment.
(cherry picked from commit ecce43877167c1cd6e24208208aed4274100c11a)
Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55
Reviewed-on: https://gerrit.libreoffice.org/1652
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -rw-r--r-- | sw/source/core/undo/unins.cxx | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index d1cef8478d80..03cc45447b21 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -25,6 +25,7 @@ #include <sot/storage.hxx> #include <editeng/keepitem.hxx> #include <svx/svdobj.hxx> +#include <xmloff/odffields.hxx> #include <docsh.hxx> #include <fmtcntnt.hxx> @@ -250,6 +251,26 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext) RemoveIdxFromRange( aPaM, sal_False ); pTxt = new String( pTxtNode->GetTxt().Copy(nCntnt-nLen, nLen) ); pTxtNode->EraseText( aPaM.GetPoint()->nContent, nLen ); + + // Undo deletes fieldmarks in two step: first the end then the start position. + // Once the start position is deleted, make sure the fieldmark itself is deleted as well. + if (nLen == 1) + { + IDocumentMarkAccess* const pMarkAccess = pTmpDoc->getIDocumentMarkAccess(); + for ( IDocumentMarkAccess::const_iterator_t i = pMarkAccess->getMarksBegin(); i != pMarkAccess->getMarksEnd(); ++i) + { + sw::mark::IMark* pMark = i->get(); + if (pMark->GetMarkStart() == *aPaM.GetPoint() && pMark->GetMarkStart().nContent == aPaM.GetPoint()->nContent) + { + sw::mark::IFieldmark* pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(pMark); + if (pFieldmark && pFieldmark->GetFieldname() == ODF_COMMENTRANGE) + { + pTmpDoc->getIDocumentMarkAccess()->deleteMark(pMark); + break; + } + } + } + } } else // otherwise Graphics/OLE/Text/... { |