summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2018-08-14 13:22:33 +0200
committerAndras Timar <andras.timar@collabora.com>2018-08-20 17:42:25 +0200
commit591b7a689928cf428f63cb31adc5bbe6b56da231 (patch)
tree0a6c5269404aa0904e57af42cc1ba2a6be150a72 /oox
parentb88053ffeed1f9fb2dda8b3bffe6353d67312e5d (diff)
tdf#116350 Better text layout for big shapes
Added some horizontal padding - for bigger shapes and vertical adjustment for multi-line labels. Change-Id: I665b238b0d08a499cd846952d831fe449f72f575 Reviewed-on: https://gerrit.libreoffice.org/58975 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit a643c8353754c6ce8b318e37cbbc60c3425e9d32) Reviewed-on: https://gerrit.libreoffice.org/59163 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 984b159e3dfa..2926614b8efc 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -527,6 +527,14 @@ static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShap
}
}
+ // Apply vertical adjustment for text on arc
+ SvxShape* pShape = SvxShape::getImplementation(xShape);
+ assert(pShape);
+ if (rClass == "fontwork-arch-up-curve")
+ pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ) );
+ else if (rClass == "fontwork-arch-down-curve")
+ pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ) );
+
// Apply preset shape
xDefaulter->createCustomShapeDefaults( rClass );