svx/source/svdraw/svdotextdecomposition.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c0053c431486c44c804f9cf4c9eeb267c056aed8
Author: matteocam <matteo.campane...@gmail.com>
Date: Mon Jul 21 22:52:49 2014 +0300
ImpCopyTextInTextObj: Create new ParaObject before passing it
Change-Id: I041e6abb5fdc7c0a573982e2dafe76a3b3f40df8
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index b7299d2..5be2260 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -790,7 +790,10 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj
*pNextTextObj) const
rOutliner.SetUpdateMode(true);
rOutliner.SetText(*pText->GetOutlinerParaObject());
Size aNewSize(rOutliner.CalcTextSize());
+ // create OutlinerParaObject for pNextTextObj
+ OutlinerParaObject* pNewParaObject=rOutliner.CreateParaObject();
rOutliner.Clear();
+
aNewSize.Width()++; // because of possible rounding errors
aNewSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
aNewSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
@@ -803,9 +806,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj
*pNextTextObj) const
}
// Set text object's string
- pNextTextObj->SetOutlinerParaObject(pText->GetOutlinerParaObject());
- // XXX: it's a pointer to the first text objs' active text!
-
+ pNextTextObj->SetOutlinerParaObject( pNewParaObject );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
