[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/core/undo/untblk.cxx  |    3 ++-
 sw/source/filter/rtf/rtffld.cxx |    3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit cc33a4836285f422cbcb29b060e2ad5c1fea849f
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri May 13 17:19:55 2011 +0200

    sw34bf06: #i117867#: SwUndoInserts::RedoImpl: do not use SwUndRng
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 75a6b8e..fb3d146 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -34,6 +34,7 @@
 #include <frmfmt.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
+#include <IShellCursorSupplier.hxx>
 #include <docary.hxx>
 #include <swundo.hxx>			// fuer die UndoIds
 #include <pam.hxx>
@@ -270,7 +271,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
 void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     // setze noch den Cursor auf den Redo-Bereich
-    SwPaM *const pPam = & AddUndoRedoPaM(rContext);
+    SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
     SwDoc* pDoc = pPam->GetDoc();
     pPam->DeleteMark();
     pPam->GetPoint()->nNode = nSttNode - nNdDiff;
commit 7c36598c27cdb5ceb4076b04bd554bda8c5b0a69
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri May 13 16:58:28 2011 +0200

    sw34bf06: #i117947#: rtf: ignore invalid tokens following field result
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index e14fdf2..8d66cad 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -1083,6 +1083,9 @@ void SwRTFParser::ReadField()
                                             nsSetAttrMode::SETATTR_DONTEXPAND );
                             pPam->DeleteMark();
 
+                            // #i117947#: insert result only once in case
+                            // field result is followed by invalid tokens
+                            sFieldStr.Erase();
                         }
                         break;
                     }