[Libreoffice-commits] core.git: svx/source
Muthu Subramanian
sumuthu at suse.com
Thu May 9 04:02:04 PDT 2013
svx/source/svdraw/svdotxed.cxx | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 19b217505d094577392d8712b9d07f29b3de2081
Author: Muthu Subramanian <sumuthu at suse.com>
Date: Thu May 9 16:27:06 2013 +0530
fdo#63311: Unable to delete text from Shape.
This avoids setting null as text to the shape.
[empty_text seems to be the initial value of text for shape
rather than null - something recent? We also seem to
export empty <text> entries because of this]
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index e498075..dc60325 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -231,14 +231,11 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
{
OutlinerParaObject* pNewText = NULL;
- if(HasTextImpl( &rOutl ) )
- {
- // to make the gray field background vanish again
- rOutl.UpdateFields();
+ // to make the gray field background vanish again
+ rOutl.UpdateFields();
- sal_uInt16 nParaAnz = static_cast< sal_uInt16 >( rOutl.GetParagraphCount() );
- pNewText = rOutl.CreateParaObject( 0, nParaAnz );
- }
+ sal_uInt16 nParaAnz = static_cast< sal_uInt16 >( rOutl.GetParagraphCount() );
+ pNewText = rOutl.CreateParaObject( 0, nParaAnz );
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
More information about the Libreoffice-commits
mailing list