use correct xml element name, related fdo#45266
Below data-pilot-groups the correct element name is
data-pilot-group-member and not data-pilot-member.
Change-Id: I41aecb7f85a881d13b3eaaa7be8de737b47ea312
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index d02a4f4f..fb5b812 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2620,6 +2620,7 @@ namespace xmloff { namespace token {
XML_IS_GROUP_FIELD,
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/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index afc66f95..2d5c42c 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -661,7 +661,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const
if (pElem)
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem);
SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, true, true);
SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER, true, true);
}
}
}
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index d1e181c..ac19a327 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1867,7 +1867,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 9f154db..547dcbd 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1784,6 +1784,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 1aabcba..82232b8 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2625,6 +2625,7 @@ namespace xmloff { namespace token {
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( "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 ),