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

New commits:
commit 9bac753c5cf1436bd4b9681543f8b451366e77b1
Author: matteocam <matteo.campane...@gmail.com>
Date:   Mon Jun 22 15:02:12 2015 -0400

    Don't broadcast changes during UF-caused OF: OF itself should clean up
    
    Change-Id: I7a4c843f787b3feb863c2cc377ae08e56913ec42

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index d4a3438..caa361e 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -789,10 +789,10 @@ void 
SdrTextObj::impLeaveOnlyNonOverflowingText(SdrOutliner *pOutliner) const
         pEdtOutl->SetText(*pNewText);
     // adds it to current outliner anyway (useful in static decomposition)
     pOutliner->SetText(*pNewText);
-    if (bInUnderflow) // must make a broadcast to reset underflow (XXX: can I 
reset it from here?)
+    /*if (bInUnderflow) // must make a broadcast to reset underflow (XXX: can 
I reset it from here?)
         const_cast<SdrTextObj*>(this)->SetOutlinerParaObject(pNewText);
-    else
-        const_cast<SdrTextObj*>(this)->NbcSetOutlinerParaObject(pNewText);
+    else*/
+    const_cast<SdrTextObj*>(this)->NbcSetOutlinerParaObject(pNewText);
 }
 
 OutlinerParaObject *SdrTextObj::impGetOverflowingParaObject(SdrOutliner 
*pOutliner, SdrTextObj *pNextTextObj) const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to