... 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
120e469 i#115391 better support for MinTextSize settings
.../svx/sdr/properties/customshapeproperties.hxx | 4 +
include/svx/svdoashp.hxx | 4 +
include/svx/svdotext.hxx | 12 ++-
.../sdr/properties/customshapeproperties.cxx | 100 +++++++++----------
svx/source/svdraw/svdoashp.cxx | 101 +++++++++++---------
svx/source/svdraw/svdotext.cxx | 97 +++++++++++++++----
svx/source/svdraw/svdotxdr.cxx | 20 +---
svx/source/svdraw/svdotxtr.cxx | 31 ++++--
8 files changed, 228 insertions(+), 141 deletions(-)
Upstream: cgit.freedesktop.org