diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2019-11-27 13:35:29 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2019-11-28 08:47:07 +0100 |
| commit | 5b5f58f395d1b6c1d007dcc6dc29535c5678f851 (patch) | |
| tree | eeca081235f494f70eb5f892722a6f6c857786e1 /oox | |
| parent | a20e061d0a54e027a9cf3702fdc88b94e9ec8c18 (diff) | |
tdf#127090 Export textbox rotation attribute.
In case "rotated textbox in a custom shape" handle
draw:text-rotate-angle attribute while exporting
ODP to PPTX.
Change-Id: I13b99da586af5e77e51a7cc93a751ab21bed7170
Reviewed-on: https://gerrit.libreoffice.org/83888
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
(cherry picked from commit 9b2f5d27cf0a0adcced813e18108d5878061d1ee)
Reviewed-on: https://gerrit.libreoffice.org/83950
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 6ca1e78d3dfb..d844d6f8242b 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2644,7 +2644,8 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin if( !xXText.is() ) return; - sal_Int32 nTextRotateAngle = 0; + sal_Int32 nTextPreRotateAngle = 0; + double nTextRotateAngle = 0; bool bIsFontworkShape(presetWarp.startsWith("text") && (presetWarp != "textNoShape")); #define DEFLRINS 254 @@ -2695,14 +2696,14 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin { for ( const auto& rProp : std::as_const(aProps) ) { - if ( rProp.Name == "TextPreRotateAngle" && ( rProp.Value >>= nTextRotateAngle ) ) + if ( rProp.Name == "TextPreRotateAngle" && ( rProp.Value >>= nTextPreRotateAngle ) ) { - if ( nTextRotateAngle == -90 ) + if ( nTextPreRotateAngle == -90 ) { sWritingMode = "vert"; bVertical = true; } - else if ( nTextRotateAngle == -270 ) + else if ( nTextPreRotateAngle == -270 ) { sWritingMode = "vert270"; bVertical = true; @@ -2712,6 +2713,8 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin } else if (rProp.Name == "AdjustmentValues") rProp.Value >>= aAdjustmentSeq; + else if( rProp.Name == "TextRotateAngle" ) + rProp.Value >>= nTextRotateAngle; else if (rProp.Name == "TextPath") { rProp.Value >>= aTextPathSeq; @@ -2769,7 +2772,7 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin XML_anchor, sVerticalAlignment, XML_anchorCtr, bHorizontalCenter ? "1" : nullptr, XML_vert, sWritingMode, - XML_rot, (nTextRotateAngle != 0) ? oox::drawingml::calcRotationValue( nTextRotateAngle * 100 ).getStr() : nullptr ); + XML_rot, ((nTextPreRotateAngle + nTextRotateAngle) != 0) ? oox::drawingml::calcRotationValue( (nTextPreRotateAngle + nTextRotateAngle) * 100 ).getStr() : nullptr ); if (bIsFontworkShape) { if (aAdjustmentSeq.hasElements()) |