Resolves: #i124389# for tables refresh TextFrame...
when OutlinerParaObject changes (cherry picked from commit 6f2ce153c4bd7350487809d87e72619d5cd9764e) Conflicts: svx/source/svdraw/svdotext.cxx Change-Id: I54e2d25a35a099f171abdb7f0c3b046c46a0421c
This commit is contained in:
committed by
Caolán McNamara
parent
7d7c1a7714
commit
8a85479845
@@ -52,6 +52,7 @@
|
|||||||
#include <svx/sdr/properties/textproperties.hxx>
|
#include <svx/sdr/properties/textproperties.hxx>
|
||||||
#include <vcl/metaact.hxx>
|
#include <vcl/metaact.hxx>
|
||||||
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
|
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
|
||||||
|
#include <svx/svdotable.hxx>
|
||||||
#include <basegfx/tuple/b2dtuple.hxx>
|
#include <basegfx/tuple/b2dtuple.hxx>
|
||||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||||
#include <basegfx/polygon/b2dpolygon.hxx>
|
#include <basegfx/polygon/b2dpolygon.hxx>
|
||||||
@@ -60,8 +61,6 @@
|
|||||||
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
||||||
#include "svdconv.hxx"
|
#include "svdconv.hxx"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
using namespace com::sun::star;
|
using namespace com::sun::star;
|
||||||
|
|
||||||
|
|
||||||
@@ -1443,8 +1442,10 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
|
|||||||
}
|
}
|
||||||
|
|
||||||
SetTextSizeDirty();
|
SetTextSizeDirty();
|
||||||
if (IsTextFrame() && (IsAutoGrowHeight() || IsAutoGrowWidth()))
|
// #i124389# also need to call NbcAdjustTextFrameWidthAndHeight when we are a table object (triggered from undo)
|
||||||
{ // adapt text frame!
|
if((IsTextFrame() || 0 != dynamic_cast< sdr::table::SdrTableObj* >(this)) && (IsAutoGrowHeight() || IsAutoGrowWidth()))
|
||||||
|
{
|
||||||
|
// adapt text frame
|
||||||
NbcAdjustTextFrameWidthAndHeight();
|
NbcAdjustTextFrameWidthAndHeight();
|
||||||
}
|
}
|
||||||
if (!IsTextFrame())
|
if (!IsTextFrame())
|
||||||
|
Reference in New Issue
Block a user