summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2013-05-09 16:27:06 +0530
committerDavid Tardon <dtardon@redhat.com>2013-05-24 18:00:43 +0200
commit84093cceb624eab7d956caebdaaf2ac10397900b (patch)
tree106456531c9c171ccc564f86230963463c6ef2ae
parent8bccae5d816abace259c9a1d0249e7195a2490d0 (diff)
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] (cherry picked from commit 19b217505d094577392d8712b9d07f29b3de2081) Signed-off-by: David Tardon <dtardon@redhat.com>
-rw-r--r--svx/source/svdraw/svdotxed.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index eea490753008..a92b17cdc0b6 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