Kaydet (Commit) 8e417a8f authored tarafından Markus Mohrhard's avatar Markus Mohrhard

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
üst 88d3931d
......@@ -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,
......
......@@ -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);
}
}
}
......
......@@ -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);
}
......
......@@ -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
};
......
......@@ -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 ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment