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

matteocam matteo.campanelli at gmail.com
Wed Jul 1 12:25:04 PDT 2015


 editeng/source/outliner/overflowingtxt.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 720f3bb602d574cea191ffc659c596064be3be74
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed Jul 1 15:24:04 2015 -0400

    Moved setting outliner mode
    
    Change-Id: I442a08d76fe201a0f26eb4d64a59ae00c9df1fed

diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 3e40b92..49284f6 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -57,11 +57,13 @@ OutlinerParaObject *OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
 
     // Simply Juxtaposing; no within-para merging
     OutlinerParaObject *pOverflowingPObj = new OutlinerParaObject(*mpContentTextObj);
+    // the OutlinerParaObject constr. at the prev line gives no valid outliner mode, so we set it
+    pOverflowingPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
     pOutl->SetText(*pOverflowingPObj);
     pOutl->AddText(*pNextPObj);
 
     OutlinerParaObject *pPObj = pOutl->CreateParaObject();
-    pPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
+    //pPObj->SetOutlinerMode(pOutl->GetOutlinerMode());
     return pPObj;
 }
 


More information about the Libreoffice-commits mailing list