diff options
| author | Armin Le Grand <alg@apache.org> | 2013-09-19 10:11:03 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-03-23 06:57:05 +0100 |
| commit | 120e469d176026ceb59abbf74d2ad255323cbc9a (patch) | |
| tree | 9ed4fe3aeeddd3a7c6333f1305bfb5ce6cf48561 /include/svx/svdotext.hxx | |
| parent | 8931ab3fc27acb0665fa636eb6390034cbb3eec6 (diff) | |
i#115391 better support for MinTextSize settings
... for TextShapes and CustomShapes
Conflicts:
include/svx/svdotext.hxx
svx/source/sdr/properties/customshapeproperties.cxx
svx/source/svdraw/svdoashp.cxx
svx/source/svdraw/svdotext.cxx
svx/source/svdraw/svdotxdr.cxx
svx/source/svdraw/svdotxtr.cxx
Change-Id: Ie6f490801b6887568135ed5f83c8bbe7ab6daa08
Diffstat (limited to 'include/svx/svdotext.hxx')
| -rw-r--r-- | include/svx/svdotext.hxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 91a935c83c33..8e184c3aec8d 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -290,8 +290,16 @@ protected: virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); bool NbcSetEckenradius(long nRad); - bool NbcSetMinTextFrameHeight(long nHgt); - bool NbcSetMinTextFrameWidth(long nWdt); + bool NbcSetAutoGrowHeight(bool bAuto); + bool NbcSetMaxTextFrameHeight(long nHgt); + bool NbcSetAutoGrowWidth(bool bAuto); + bool NbcSetMaxTextFrameWidth(long nWdt); + bool NbcSetFitToSize(SdrFitToSizeType eFit); + + // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set + // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities + // and object sizes + virtual void AdaptTextMinSize(); // Konstruktoren fuer beschriftete Zeichenobjekte SdrTextObj(); |