[Libreoffice-commits] .: sw/source

[Miklos Vajna]

 sw/source/core/doc/docedt.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f573b16e7b4909d5cae129cc00f50be4b06b468d
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jul 20 18:17:42 2012 +0200

    SwDoc::DeleteRangeImplImpl: don't touch fieldmarks when undo is not available
    
    Change-Id: Ia7fa4510a874a518c8bff3614a38425ee7802ad8

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 5ae2ab6..f1dedb3 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1642,8 +1642,8 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
         }
     }
 
-    // Delete fieldmarks before postits.
-    if (pStt->nNode == pEnd->nNode && (pEnd->nContent.GetIndex() - pStt->nContent.GetIndex()) == 1)
+    // Delete fieldmarks before postits, but let's leave them alone during import.
+    if (GetIDocumentUndoRedo().DoesUndo() && pStt->nNode == pEnd->nNode && (pEnd->nContent.GetIndex() - pStt->nContent.GetIndex()) == 1)
     {
         SwTxtNode* pTxtNd = rPam.Start()->nNode.GetNode().GetTxtNode();
         xub_StrLen nIndex = rPam.Start()->nContent.GetIndex();