diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-08 00:47:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-08 12:17:37 +0000 |
| commit | 21afec83dbb6ab338e43db647345cda81db1039a (patch) | |
| tree | 2b0d42526ae20630fd8e5bc41ff5ab15a7607827 | |
| parent | Resolves fdo#87581: Pb to delete words with 2 initials in Autocorr Except (diff) | |
| download | core-21afec83dbb6ab338e43db647345cda81db1039a.tar.gz core-21afec83dbb6ab338e43db647345cda81db1039a.zip | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -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 549446ce01e2..8bc0b1a07abc 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 3840a78e281e..db4cb90eceb5 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 379bb524d08a..a3fb7d5a274d 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 5833f043e27a..4c961923cd1d 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 ), |