diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2018-08-01 15:58:20 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-08-20 10:13:48 +0200 |
commit | 409fd186af22bd9c1819cc0f05bfca3bdf427a42 (patch) | |
tree | 5006adad6d9b6ebf161ddf2315a85b5a4ff2411b /oox | |
parent | b56857dbd21083f5d41eaf4c0f08db1977cf8d2e (diff) |
tdf#116350 Export preset text geometry (text effects)
Change-Id: Ifb921b56387ca183b5a57126f6e88e2f9a4ecb3d
Reviewed-on: https://gerrit.libreoffice.org/58430
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58839
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.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 2a28ea06d0ec..f13fa4a2f56f 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -436,6 +436,7 @@ static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust ) static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShape, const OUString& rClass, + const OUString& rPresetType, const CustomShapePropertiesPtr pCustomShapePropertiesPtr, const TextBodyPtr pTextBody, const GraphicHelper& rGraphicHelper ) @@ -540,6 +541,7 @@ static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShap const OUString sPath( "Path" ); const OUString sTextPath( "TextPath" ); const OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sPresetTextWarp( "PresetTextWarp" ); lcl_resetPropertyValue( aGeomPropVec, sCoordinateSize ); lcl_resetPropertyValue( aGeomPropVec, sEquations ); @@ -556,6 +558,9 @@ static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShap lcl_setPropertyValue( aGeomPropVec, sTextPath, comphelper::makePropertyValue( sTextPath, aPropertyValues ) ); + lcl_setPropertyValue( aGeomPropVec, sPresetTextWarp, + comphelper::makePropertyValue( sPresetTextWarp, rPresetType ) ); + if ( rClass == "fontwork-arch-up-curve" || rClass == "fontwork-circle-curve" || rClass == "fontwork-arch-down-curve" || rClass == "fontwork-open-circle-curve" ) lcl_setPropertyValue( aGeomPropVec, sAdjustmentValues, @@ -1309,7 +1314,7 @@ Reference< XShape > const & Shape::createAndInsert( const OUString sPresetType = mpTextBody->getTextProperties().msPrst; sClass = PresetGeometryTypeNames::GetFontworkType( sPresetType ); - lcl_createPresetShape( mxShape, sClass, mpCustomShapePropertiesPtr, mpTextBody, rGraphicHelper ); + lcl_createPresetShape( mxShape, sClass, sPresetType, mpCustomShapePropertiesPtr, mpTextBody, rGraphicHelper ); } } } |