summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-12-08 00:47:44 +0100
committerAndras Timar <andras.timar@collabora.com>2015-01-08 15:09:44 +0100
commit33a2c106f68c28d28a25d46d13c5a3f6e3f61d07 (patch)
treeda25c838f35c05012dd68c5c698de6599da44c1e /sc
parentbc3a5901092079551309edb011467512bbfdf3be (diff)
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> (cherry picked from commit 21afec83dbb6ab338e43db647345cda81db1039a)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx1
2 files changed, 2 insertions, 1 deletions
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
};