[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/xmloff sc/source xmloff/source

[Markus Mohrhard]

 include/xmloff/xmltoken.hxx       |    1 +
 sc/source/filter/xml/xmldpimp.cxx |    2 +-
 sc/source/filter/xml/xmlimprt.cxx |    1 +
 xmloff/source/core/xmltoken.cxx   |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 21afec83dbb6ab338e43db647345cda81db1039a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Dec 8 00:47:44 2014 +0100

    import part for: " use correct xml element name, related fdo#45266"
    
    Change-Id: Ied71383fc837c7e667455f84937801e8d45f2989
    Reviewed-on: https://gerrit.libreoffice.org/13360
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 549446c..8bc0b1a 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2619,6 +2619,7 @@ namespace xmloff { namespace token {
         XML_STEP,
         XML_DATA_PILOT_GROUPS,
         XML_DATA_PILOT_GROUP,
+        XML_DATA_PILOT_GROUP_MEMBER,
 
         XML_JAPANESE_CANDLE_STICK,
         XML_NAMED_SYMBOL,
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 3840a78..db4cb90 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1868,7 +1868,7 @@ SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 n
 
     if (nPrefix == XML_NAMESPACE_TABLE)
     {
-        if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER))
+        if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER) || IsXMLToken(rLName, XML_DATA_PILOT_GROUP_MEMBER))
             pContext = new ScXMLDataPilotGroupMemberContext(GetScImport(), nPrefix, rLName, xAttrList, this);
     }
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 379bb52..a3fb7d5 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1792,6 +1792,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap()
         static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
         {
             { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,       XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
+            { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER,       XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER   },
             XML_TOKEN_MAP_END
         };
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5833f04..4c96192 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2624,6 +2624,7 @@ namespace xmloff { namespace token {
         TOKEN( "step",                                 XML_STEP ),
         TOKEN( "data-pilot-groups",                    XML_DATA_PILOT_GROUPS ),
         TOKEN( "data-pilot-group",                     XML_DATA_PILOT_GROUP ),
+        TOKEN( "data-pilot-group-member",              XML_DATA_PILOT_GROUP_MEMBER ),
         TOKEN( "japanese-candle-stick",        XML_JAPANESE_CANDLE_STICK ),
         TOKEN( "named-symbol",                 XML_NAMED_SYMBOL ),
         TOKEN( "diamond",                      XML_DIAMOND ),