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

[Markus Mohrhard]

 oox/source/drawingml/chart/objectformatter.cxx |    1 +
 sc/source/filter/excel/xepivotxml.cxx          |   16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 6e3c36255b9a17095745aba2489b347bccf42423
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 21 21:55:24 2015 +0200

    chart series support hatches, tdf#94227
    
    Change-Id: Ib3a1ccda738091466d5e2866823f64b254ed5bab

diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index e7461c6..4ab75cb 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -514,6 +514,7 @@ static const sal_Int32 spnFilledPropIds[] =
     PROP_FillBitmapPositionOffsetX,
     PROP_FillBitmapPositionOffsetY,
     PROP_FillBitmapRectanglePoint,
+    PROP_FillHatch,
     PROP_END_LIST
 };
 
commit 760a684155ba4b41a1db56d85374575a20abd375
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Oct 18 15:02:36 2015 +0200

    make our pivot table export a bit better
    
    Change-Id: I62fe627eab0163715fc90d17a9b8992bc17682b9

diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index d3bd613..917af8d 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -228,11 +228,25 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( XclExpXmlStream& rStrm, const Entr
 
         const ScDPCache::ItemsType& rFieldItems = rCache.GetDimMemberValues(i);
 
+        ScDPCache::ItemsType::const_iterator it = rFieldItems.begin(), itEnd = rFieldItems.end();
+
+        std::set<ScDPItemData::Type> aDPTypes;
+        for (; it != itEnd; ++it)
+        {
+            aDPTypes.insert(it->GetType());
+        }
+
+        auto aDPTypeEnd = aDPTypes.cend();
+
         pDefStrm->startElement(XML_sharedItems,
             XML_count, OString::number(static_cast<long>(rFieldItems.size())).getStr(),
+            XML_containsMixedTypes, XclXmlUtils::ToPsz10(aDPTypes.size() > 1),
+            XML_containsSemiMixedTypes, XclXmlUtils::ToPsz10(aDPTypes.size() > 1),
+            XML_containsString, XclXmlUtils::ToPsz10(aDPTypes.find(ScDPItemData::String) != aDPTypeEnd),
+            XML_containsNumber, XclXmlUtils::ToPsz10(aDPTypes.find(ScDPItemData::Value) != aDPTypeEnd),
             FSEND);
 
-        ScDPCache::ItemsType::const_iterator it = rFieldItems.begin(), itEnd = rFieldItems.end();
+        it = rFieldItems.begin();
         for (; it != itEnd; ++it)
         {
             const ScDPItemData& rItem = *it;