[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlexprt.cxx                |    9 ++++++++-
 sc/source/ui/dataprovider/datatransformation.cxx |    4 ++--
 sc/source/ui/inc/datatransformation.hxx          |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 8e9d43546c8e46ea635472ddf07f5c183dc13360
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 12 01:31:18 2018 +0200

    fix the build
    
    Change-Id: I661666166594ce3012767fac6edc64aa424442e5

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 63ec4abc9302..4f8b61980106 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4269,9 +4269,16 @@ void ScXMLExport::WriteExternalDataTransformations(const std::vector<std::shared
                     break;
                 }
 
-                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLUMN, OUString::number(aNumberTransformation->getColumn()));
                 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_PRECISION, OUString::number(aNumberTransformation->getPrecision()));
                 SvXMLElementExport aTransformation(*this, XML_NAMESPACE_CALC_EXT, XML_COLUMN_NUMBER_TRANSFORMATION, true, true);
+
+                std::set<SCCOL> aColumns = aNumberTransformation->getColumn();
+                for(auto& col : aColumns)
+                {
+                    // Columns
+                    AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLUMN, OUString::number(col));
+                    SvXMLElementExport aCol(*this, XML_NAMESPACE_CALC_EXT, XML_COLUMN, true, true);
+                }
             }
             break;
             default:
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx b/sc/source/ui/dataprovider/datatransformation.cxx
index 0e2048d3dd43..95846470a847 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -645,10 +645,10 @@ int NumberTransformation::getPrecision() const
     return maPrecision;
 }
 
-SCCOL NumberTransformation::getColumn() const
+std::set<SCCOL> NumberTransformation::getColumn() const
 {
     return mnCol;
 }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx
index 71eb7406e5a4..0096e0c5a623 100644
--- a/sc/source/ui/inc/datatransformation.hxx
+++ b/sc/source/ui/inc/datatransformation.hxx
@@ -145,7 +145,7 @@ class SC_DLLPUBLIC NumberTransformation : public DataTransformation
     virtual TransformationType getTransformationType() const override;
     NUMBER_TRANSFORM_TYPE getNumberTransfromationType() const;
     int getPrecision() const;
-    SCCOL getColumn() const;
+    std::set<SCCOL> getColumn() const;
 };
 
 }