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

[Mike Kaganski (via logerrit)]

 sc/source/filter/excel/xepivotxml.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 10b2ae55c575d8738d2b30c0c94e12ffca689ffe
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu May 2 18:37:02 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu May 2 18:38:16 2019 +0200

    Reorder showAll after compact, like Excel does, for easier comparison
    
    Change-Id: I32e0e147769f758df898814659f5e4380bb78d1f
    Reviewed-on: https://gerrit.libreoffice.org/71683
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index dc825f0c836b..e3ee0d7e0573 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -877,8 +877,8 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP
         if (!pDim)
         {
             pPivotStrm->singleElement(XML_pivotField,
-                XML_showAll, ToPsz10(false),
-                XML_compact, ToPsz10(false));
+                XML_compact, ToPsz10(false),
+                XML_showAll, ToPsz10(false));
             continue;
         }
 
@@ -893,15 +893,15 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP
             if(bDimInTabularMode)
             {
                 pPivotStrm->singleElement(XML_pivotField,
-                    XML_showAll, ToPsz10(false),
                     XML_compact, ToPsz10(false),
+                    XML_showAll, ToPsz10(false),
                     XML_outline, ToPsz10(false));
             }
             else
             {
                 pPivotStrm->singleElement(XML_pivotField,
-                    XML_showAll, ToPsz10(false),
-                    XML_compact, ToPsz10(false));
+                    XML_compact, ToPsz10(false),
+                    XML_showAll, ToPsz10(false));
             }
             continue;
         }
@@ -912,16 +912,16 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP
             {
                 pPivotStrm->singleElement(XML_pivotField,
                     XML_dataField, ToPsz10(true),
-                    XML_showAll, ToPsz10(false),
                     XML_compact, ToPsz10(false),
+                    XML_showAll, ToPsz10(false),
                     XML_outline, ToPsz10(false));
             }
             else
             {
                 pPivotStrm->singleElement(XML_pivotField,
                     XML_dataField, ToPsz10(true),
-                    XML_showAll, ToPsz10(false),
-                    XML_compact, ToPsz10(false));
+                    XML_compact, ToPsz10(false),
+                    XML_showAll, ToPsz10(false));
             }
             continue;
         }
@@ -975,6 +975,7 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP
 
         auto pAttList = sax_fastparser::FastSerializerHelper::createAttrList();
         pAttList->add(XML_axis, toOOXMLAxisType(eOrient));
+        pAttList->add(XML_compact, ToPsz10(false));
         pAttList->add(XML_showAll, ToPsz10(false));
 
         long nSubTotalCount = pDim->GetSubTotalsCount();
@@ -994,7 +995,6 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP
         if (!bHasDefaultSubtotal)
             pAttList->add(XML_defaultSubtotal, ToPsz10(false));
 
-        pAttList->add( XML_compact, ToPsz10(false));
         if(bDimInTabularMode)
             pAttList->add( XML_outline, ToPsz10(false));
         sax_fastparser::XFastAttributeListRef xAttributeList(pAttList);