diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2018-08-07 10:44:21 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-20 10:14:41 +0200 |
| commit | 40b396ef207213ebd07981206674a2260256cb3c (patch) | |
| tree | aed1e5334a28cfa67dbe709fd4ac4ad8edb2f358 /oox | |
| parent | 406280c62843e9ed167e7adaa005fba92a39608f (diff) | |
tdf#116350 Correctly display text on arc
Change-Id: Ice8c141db20d43ccc8d6e2b56004a4a28d2b257a
Reviewed-on: https://gerrit.libreoffice.org/58729
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58840
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index f13fa4a2f56f..5483dcc06ff1 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -547,13 +547,22 @@ static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShap lcl_resetPropertyValue( aGeomPropVec, sEquations ); lcl_resetPropertyValue( aGeomPropVec, sPath ); + // Some shapes don't need scaling + bool bScale = true; + if ( rPresetType == "textRingInside" + || rPresetType == "textRingOutside" + || rPresetType == "textCirclePour" ) + { + bScale = false; + } + // Apply geometry properties uno::Sequence<beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence( { { sTextPath, uno::makeAny( true ) }, { "TextPathMode", uno::Any( drawing::EnhancedCustomShapeTextPathMode_PATH ) }, - { "ScaleX", uno::Any( false ) } } ) ); + { "ScaleX", uno::Any( bScale ) } } ) ); lcl_setPropertyValue( aGeomPropVec, sTextPath, comphelper::makePropertyValue( sTextPath, aPropertyValues ) ); |