svx/source/svdraw/svdotxed.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
New commits: commit 762a8d89d5686085e545a1e1ada4254a8550992f Author: Muthu Subramanian <sumu...@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] (cherry picked from commit 19b217505d094577392d8712b9d07f29b3de2081) Signed-off-by: David Tardon <dtar...@redhat.com> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index eea4907..a92b17c 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits