diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2013-05-09 16:27:06 +0530 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-31 13:44:45 +0200 |
| commit | cdd4ad86ed711f4db5e40de62d02de9a2f7bee2d (patch) | |
| tree | 3fa149aa4ad1c364263cb3e39d422cd84d3e1b7c | |
| parent | 51d8dc1db12ec5557ac7efe57b954525eee1e7e8 (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.cxx | 11 |
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 |