[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

[Armin Le Grand]

 svx/source/svdraw/svdotext.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 6f2ce153c4bd7350487809d87e72619d5cd9764e
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Mar 26 11:54:52 2014 +0000

    i124389 for tables refresh TextFrame when OutlinerParaObject changes

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 41eee32..59cf55b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -63,6 +63,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <vcl/virdev.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <svx/svdotable.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -1500,8 +1501,11 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
     }
 
     SetTextSizeDirty();
-    if (IsTextFrame() && (IsAutoGrowHeight() || IsAutoGrowWidth()))
-    { // Textrahmen anpassen!
+
+    // #124389# also need to call NbcAdjustTextFrameWidthAndHeight when we are a table object (triggered from undo)
+    if((IsTextFrame() || 0 != dynamic_cast< sdr::table::SdrTableObj* >(this)) && (IsAutoGrowHeight() || IsAutoGrowWidth()))
+    {
+        // adapt text frame
         NbcAdjustTextFrameWidthAndHeight();
     }
     if (!IsTextFrame())