svx/source/svdraw/svdotextdecomposition.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit b35ee177580a9bf9a28572bb5af02abe07faec06 Author: matteocam <[email protected]> Date: Wed Jun 10 19:21:31 2015 -0400 Getting nonoverflowing text from edit outliner if in edit mode Change-Id: I7cc613046194054b60718d89bcfe209eaaaf66c5 diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 9fff4c0..5bcfbe3 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -731,8 +731,12 @@ void SdrTextObj::impDecomposeContourTextPrimitive( OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner *pOutliner) const { NonOverflowingText *pNonOverflowingTxt; - pNonOverflowingTxt = - pOutliner->GetNonOverflowingText(); + if (pEdtOutl != NULL) + pNonOverflowingTxt = + pEdtOutl->GetNonOverflowingText(); + else + pNonOverflowingTxt = + pOutliner->GetNonOverflowingText(); pOutliner->Clear(); //pOutliner->SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0)); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
