svx/source/svdraw/svdotextdecomposition.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit caa6b1833fb592b42b0549d9f749d0ac265b2ad0 Author: matteocam <[email protected]> Date: Thu Jun 11 13:03:13 2015 -0400 Removed Clear-s. Used Empty Para Obj Change-Id: Ifc8869a6c7aa0c1279c7363ba2591a49417fb6f3 diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index d88dc56..d77e157 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -731,6 +731,7 @@ void SdrTextObj::impDecomposeContourTextPrimitive( OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner *pOutliner) const { NonOverflowingText *pNonOverflowingTxt; + // We have to get text from the editing outliner if this is set if (pEdtOutl != NULL) pNonOverflowingTxt = pEdtOutl->GetNonOverflowingText(); @@ -751,14 +752,14 @@ OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner *pOut Paragraph *pTmpPara0 = pOutliner->GetParagraph(0); pOutliner->SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0); OutlinerParaObject *pPObj = pOutliner->CreateParaObject(); - pOutliner->Clear(); + //pOutliner->Clear(); //pOutliner->SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0)); if (pNonOverflowingTxt->mpHeadParas != NULL) pOutliner->SetText(*pNonOverflowingTxt->mpHeadParas); else { // set empty paraObj - - pOutliner->SetText(*emptyParaObj); + OutlinerParaObject *pEmptyPObj = pOutliner->GetEmptyParaObject(); + pOutliner->SetText(*pEmptyPObj); } pOutliner->AddText(*pPObj); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
