summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-06-04 15:24:56 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-04 15:34:17 +0200
commit27f64bb866037c0321966bdb0c96cac92db2a208 (patch)
tree535f3e58285cf7454ac17a2a3d41e1dde7816248
parent9a63f21bcefe07250de463c488c459b0767534b4 (diff)
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)
-rw-r--r--sw/source/core/unocore/unotext.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 00c6e85bd344..14c11e4a401a 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);