diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-08 00:47:44 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-08 00:47:44 +0100 |
commit | c795936a66041bb1dff8bd392f462ff80f583385 (patch) | |
tree | bb276909097ddecdc2872e18b095ce74cc6682f2 | |
parent | 40ac1ada98e3e2648daf9d17e520040be2c17911 (diff) |
import part for: " use correct xml element name, related fdo#45266"
Change-Id: Ied71383fc837c7e667455f84937801e8d45f2989
-rw-r--r-- | include/xmloff/xmltoken.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldpimp.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index e1a9d0094277..96393262b833 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 d1e181c2776a..ac19a32775f9 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 1620f44d3712..84c1ad898cbb 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1785,6 +1785,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 11e08a1a5217..323e0739dafd 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 ), |