[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - oox/source

[Balazs Varga (via logerrit)]

 oox/source/export/chartexport.cxx |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit adb930e39b8e9263923dcb3f8edce8990707297d
Author:     Balazs Varga <balazs.varga991 at gmail.com>
AuthorDate: Wed May 20 21:10:41 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Thu Jul 16 22:43:28 2020 +0200

    tdf#133190 tdf#133191 Chart OOXML export: fix text wrap and rotation
    
    of data point labels.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94598
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 74d020fb1344dd904681b612739727351f183b78)
    
    Change-Id: Ic61d9ee149e838c000b5dc9ac0411bbe0f07219a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98767
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index aa27692400b8..0951ca11dc03 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2514,9 +2514,11 @@ void ChartExport::exportTextProps(const Reference<XPropertySet>& xPropSet)
     pFS->startElement(FSNS(XML_c, XML_txPr));
 
     sal_Int32 nRotation = 0;
+    const char* textWordWrap = nullptr;
+
     if (auto xServiceInfo = uno::Reference<lang::XServiceInfo>(xPropSet, uno::UNO_QUERY))
     {
-        double fMultiplier = 0;
+        double fMultiplier = 0.0;
         // We have at least two possible units of returned value: degrees (e.g., for data labels),
         // and 100ths of degree (e.g., for axes labels). The latter is returned as an Any wrapping
         // a sal_Int32 value (see WrappedTextRotationProperty::convertInnerToOuterValue), while
@@ -2524,8 +2526,15 @@ void ChartExport::exportTextProps(const Reference<XPropertySet>& xPropSet)
         // use. But testing the service info should be more robust.
         if (xServiceInfo->supportsService("com.sun.star.chart.ChartAxis"))
             fMultiplier = -600.0;
-        else if (xServiceInfo->supportsService("com.sun.star.chart2.DataSeries"))
+        else if (xServiceInfo->supportsService("com.sun.star.chart2.DataSeries") || xServiceInfo->supportsService("com.sun.star.chart2.DataPointProperties"))
+        {
             fMultiplier = -60000.0;
+            bool bTextWordWrap = false;
+            if ((xPropSet->getPropertyValue("TextWordWrap") >>= bTextWordWrap) && bTextWordWrap)
+                textWordWrap = "square";
+            else
+                textWordWrap = "none";
+        }
 
         if (fMultiplier)
         {
@@ -2533,25 +2542,26 @@ void ChartExport::exportTextProps(const Reference<XPropertySet>& xPropSet)
             uno::Any aAny = xPropSet->getPropertyValue("TextRotation");
             if (aAny.hasValue() && (aAny >>= fTextRotation))
             {
+                fTextRotation *= fMultiplier;
                 // The MS Office UI allows values only in range of [-90,90].
-                if (fTextRotation > 9000.0 && fTextRotation < 27000.0)
+                if (fTextRotation < -5400000.0 && fTextRotation > -16200000.0)
                 {
                     // Reflect the angle if the value is between 90° and 270°
-                    fTextRotation -= 18000.0;
+                    fTextRotation += 10800000.0;
                 }
-                else if (fTextRotation >=27000.0)
+                else if (fTextRotation <= -16200000.0)
                 {
-                    fTextRotation -= 36000.0;
+                    fTextRotation += 21600000.0;
                 }
-                nRotation = std::round(fTextRotation * fMultiplier);
+                nRotation = std::round(fTextRotation);
             }
         }
     }
 
     if (nRotation)
-        pFS->singleElement(FSNS(XML_a, XML_bodyPr), XML_rot, OString::number(nRotation));
+        pFS->singleElement(FSNS(XML_a, XML_bodyPr), XML_rot, OString::number(nRotation), XML_wrap, textWordWrap);
     else
-        pFS->singleElement(FSNS(XML_a, XML_bodyPr));
+        pFS->singleElement(FSNS(XML_a, XML_bodyPr), XML_wrap, textWordWrap);
 
     pFS->singleElement(FSNS(XML_a, XML_lstStyle));