diff options
| author | Armin Le Grand <alg@apache.org> | 2014-03-26 11:54:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-28 09:40:29 +0000 |
| commit | 8a85479845c89093bd2a05c31bccf8cbb7c55ad3 (patch) | |
| tree | 4ae7b5c38c55af3f99e57f9550ae1ccfab05ab56 | |
| parent | 7d7c1a7714c1bb2553fdbebb9e79580c28a069a6 (diff) | |
Resolves: #i124389# for tables refresh TextFrame...
when OutlinerParaObject changes
(cherry picked from commit 6f2ce153c4bd7350487809d87e72619d5cd9764e)
Conflicts:
svx/source/svdraw/svdotext.cxx
Change-Id: I54e2d25a35a099f171abdb7f0c3b046c46a0421c
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 8e89fb2b8e39..b13c9ea3a6da 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -52,6 +52,7 @@ #include <svx/sdr/properties/textproperties.hxx> #include <vcl/metaact.hxx> #include <svx/sdr/contact/viewcontactoftextobj.hxx> +#include <svx/svdotable.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -60,8 +61,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "svdconv.hxx" - - using namespace com::sun::star; @@ -1443,8 +1442,10 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec } SetTextSizeDirty(); - if (IsTextFrame() && (IsAutoGrowHeight() || IsAutoGrowWidth())) - { // adapt text frame! + // #i124389# 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()) |