From 3cbb6e73ecbff5d83be817c0dab680c5d925c6fa Mon Sep 17 00:00:00 2001
From: Szymon Kłos <szymon.klos@collabora.com>
Date: Fri, 6 Oct 2017 16:04:25 +0200
Subject: SmartArt: export text rotation in the PPTX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c
Reviewed-on: https://gerrit.libreoffice.org/43202
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
---
 oox/source/export/chartexport.cxx | 22 +---------------------
 oox/source/export/drawingml.cxx   |  4 +++-
 2 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'oox')

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e3b69806df07..ffd1481ffdbe 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -893,26 +893,6 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x
     pFS->endElement( FSNS( XML_c, XML_legend ) );
 }
 
-namespace {
-
-/**
- * nRotation is a 100th of a degree and the return value is
- * in a 60,000th of a degree
- *
- * Also rotation is in opposite directions so multiply with -1
- */
-OString calcRotationValue(sal_Int32 nRotation)
-{
-    if (nRotation > 18000) // 180 degree
-    {
-        nRotation -= 36000;
-    }
-    nRotation *= -600;
-    return OString::number(nRotation);
-}
-
-}
-
 void ChartExport::exportTitle( const Reference< XShape >& xShape )
 {
     OUString sText;
@@ -945,7 +925,7 @@ void ChartExport::exportTitle( const Reference< XShape >& xShape )
 
     pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
             XML_vert, sWritingMode,
-            XML_rot, calcRotationValue(nRotation).getStr(),
+            XML_rot, oox::drawingml::calcRotationValue(nRotation).getStr(),
             FSEND );
     // TODO: lstStyle
     pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 64e916e1033f..5beb7212ce0b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2224,6 +2224,8 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
     if( !xXText.is() )
         return;
 
+    sal_Int32 nTextRotateAngle = 0;
+
 #define DEFLRINS 254
 #define DEFTBINS 127
     sal_Int32 nLeft, nRight, nTop, nBottom;
@@ -2263,7 +2265,6 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
         {
             for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems; ++i )
             {
-                sal_Int32 nTextRotateAngle = 0;
                 if ( aProps[ i ].Name == "TextPreRotateAngle" && ( aProps[ i ].Value >>= nTextRotateAngle ) )
                 {
                     if ( nTextRotateAngle == -90 )
@@ -2320,6 +2321,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,
                                FSEND );
         if( !presetWarp.isEmpty())
         {
-- 
cgit