[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Michael Stahl]

 sc/source/filter/xml/xmlimprt.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit f3ea88ef4431541ef85a26412b71e0e29b5cc529
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 8 13:07:41 2015 +0100

    sc: ODF import of data pilot:
    
    Revert part of 8e417a8fed528034e946bd25e66ce346c1b5384d that
    looks unnecessary:
    
    this is used in ScXMLDataPilotMembersContext::CreateChildContext() which
    is below table:data-pilot-level which actually uses the
    data-pilot-member element, whereas the data-pilot-group element occurs
    below table:data-pilot-groups.
    
    Change-Id: I7a3183bd3dbfa98b3bdf5e581b700910025af965
    (cherry picked from commit 4680eba921cccefc05587a42e8c7348cc95750a1)
    Reviewed-on: https://gerrit.libreoffice.org/13810
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 84c1ad8..1620f44 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1785,7 +1785,6 @@ 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
         };