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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |    2 ++
 svx/source/svdraw/svdotxat.cxx              |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit cd32b7e63b46f88ed40763a2ee1ee12c760dd4cd
Author: matteocam <matteo.campane...@gmail.com>
Date:   Mon Jun 8 11:50:16 2015 -0400

    Attempt in setting stylesheets
    
    Change-Id: I6d1bcc942ce902c9534e29d2539ac9d6a9a05560

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 26afbe8b..de67750 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -735,6 +735,7 @@ OutlinerParaObject 
*SdrTextObj::impGetNonOverflowingParaObject() const
         pEdtOutl->GetNonOverflowingText();
     SdrOutliner &rOutliner = ImpGetDrawOutliner();
     rOutliner.Clear();
+    rOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
     if (pNonOverflowingTxt->mPreOverflowingTxt == "" &&
         pNonOverflowingTxt->mpHeadParas != NULL) {
@@ -747,6 +748,7 @@ OutlinerParaObject 
*SdrTextObj::impGetNonOverflowingParaObject() const
         rOutliner.SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0);
         OutlinerParaObject *pPObj = rOutliner.CreateParaObject();
         rOutliner.Clear();
+        rOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
         if (pNonOverflowingTxt->mpHeadParas != NULL)
             rOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 986ef36..92be5c6 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -194,6 +194,8 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool 
bHgt, bool bWdt)
         if (HAS_BASE(SdrCaptionObj,this)) { // this is a hack
             ((SdrCaptionObj*)this)->ImpRecalcTail();
         }
+    } else {
+        
//ImpGetDrawOutliner().SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
     }
     return bRet;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits