[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - include/xmloff sc/source xmloff/source

[Markus Mohrhard]

 include/xmloff/xmltoken.hxx                 |    1 -
 sc/source/filter/xml/XMLExportDataPilot.cxx |    4 +---
 xmloff/source/core/xmltoken.cxx             |    1 -
 xmloff/source/draw/shapeexport.cxx          |    1 +
 4 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c5abf965fae4aa979989e60b00ab926ddf35ae8f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 7 00:55:48 2014 +0100

    correct order of xml elements, related fdo#45266
    
    Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d

diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 4b9c913..047934f 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -699,8 +699,8 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim
     rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sValueStr);
 
     SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, true, true);
-    WriteFieldReference(pDim);
     WriteLevels(pDim);
+    WriteFieldReference(pDim);
     if( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_DATA )
         WriteGroupDimElements(pDim, pDimData);
 }
commit d981c7fa5500dab0d24a36506e706f4a40edf075
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 7 00:41:44 2014 +0100

    remove invalid attribute that is not read anyway
    
    Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 6dd7d1c..88da569 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2609,7 +2609,6 @@ namespace xmloff { namespace token {
         XML_DATE_START,
         XML_DATE_END,
         XML_STEP,
-        XML_IS_GROUP_FIELD,
         XML_DATA_PILOT_GROUPS,
         XML_DATA_PILOT_GROUP,
 
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index cd711d4..4b9c913 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -599,7 +599,6 @@ void ScXMLExportDataPilot::WriteGroupDimAttributes(const ScDPSaveGroupDimension*
     if (pGroupDim)
     {
         OUString aSrcFieldName = ScDPUtil::getSourceDimensionName(pGroupDim->GetSourceDimName());
-        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, XML_TRUE);
         rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, aSrcFieldName);
         if (pGroupDim->GetDatePart())
         {
@@ -613,7 +612,6 @@ void ScXMLExportDataPilot::WriteNumGroupDim(const ScDPSaveNumGroupDimension* pNu
 {
     if (pNumGroupDim)
     {
-        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, XML_TRUE);
         if (pNumGroupDim->GetDatePart())
         {
             WriteDatePart(pNumGroupDim->GetDatePart());
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 555f24b..e39814d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2614,7 +2614,6 @@ namespace xmloff { namespace token {
         TOKEN( "date-start",                           XML_DATE_START ),
         TOKEN( "date-end",                             XML_DATE_END ),
         TOKEN( "step",                                 XML_STEP ),
-        TOKEN( "is-group-field",                       XML_IS_GROUP_FIELD ),
         TOKEN( "data-pilot-groups",                    XML_DATA_PILOT_GROUPS ),
         TOKEN( "data-pilot-group",                     XML_DATA_PILOT_GROUP ),
         TOKEN( "japanese-candle-stick",        XML_JAPANESE_CANDLE_STICK ),
commit cbd8ae9e9c0fb5b936264dc8956854184e70ca7f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Dec 6 08:21:50 2014 +0100

    the xlink:type attribute is mandatory, related fdo#79449
    
    Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index bddf0ac..22dcbeb 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1740,6 +1740,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
                             XML_NAMESPACE_DOM, OUString(  "click"  ) ) );
                 mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
                 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
+                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, "simple" );
 
                 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
             }