[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Michael Stahl]

 sw/source/core/unocore/unotext.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 27f64bb866037c0321966bdb0c96cac92db2a208
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 4 15:24:56 2013 +0200

    fdo#64761: sw: avoid another ~SwIndexReg assert
    
    SwXText::convertToTextFrame(): This one is rather spurious since the
    local variables aren't used later anyway, so just park them  somewhere safe.
    
    Change-Id: I47d3092fbf22a228fa3f440602c0affa43fbb6d7
    (cherry picked from commit 0e86210bc480de38919aacf709513f95fab26d35)

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 00c6e85..14c11e4 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1656,6 +1656,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
             if (bParaBeforeInserted)
             {
                 SwCursor aDelete(*aStartPam.GetPoint(), 0, false);
+                *aStartPam.GetPoint() = // park it because node is deleted
+                    SwPosition(GetDoc()->GetNodes().GetEndOfContent());
                 aDelete.MovePara(fnParaCurr, fnParaStart);
                 aDelete.SetMark();
                 aDelete.MovePara(fnParaCurr, fnParaEnd);
@@ -1664,6 +1666,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
             if (bParaAfterInserted)
             {
                 SwCursor aDelete(*pEndPam->GetPoint(), 0, false);
+                *pEndPam->GetPoint() = // park it because node is deleted
+                    SwPosition(GetDoc()->GetNodes().GetEndOfContent());
                 aDelete.MovePara(fnParaCurr, fnParaStart);
                 aDelete.SetMark();
                 aDelete.MovePara(fnParaCurr, fnParaEnd);