[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cebc8ad8abbe674e0cc5d42df1edfbc2010d8df5
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jun 8 11:55:39 2015 -0400

    Checked existence of editing outliner
    
    Change-Id: I196b4aea54ede7c21eba8b87276a789818377117

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index de67750..62dd5d0 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -762,10 +762,11 @@ OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject() const
 void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 {
     OutlinerParaObject *pNewText = impGetNonOverflowingParaObject();
-    // for while we are in editing mode
-    pEdtOutl->SetText(*pNewText);
+    // we need this when we are in editing mode
+    if (pEdtOutl != NULL)
+        pEdtOutl->SetText(*pNewText);
+
     const_cast<SdrTextObj*>(this)->SetOutlinerParaObject(pNewText);
-    //const_cast<SdrTextObj*>(this)->ReformatText();
 }