diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:00:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:00:36 +0000 |
| commit | c5982ea236f45f5eb65d7290919693e3cdd7034d (patch) | |
| tree | 02b62e684733532333b2a8cd260a432ac8730cf4 /sc/source/filter/xml/xmldpimp.cxx | |
| parent | 7bc7616412db24d8202a8b50263de64ade0d79fa (diff) | |
INTEGRATION: CWS dr42 (1.21.18); FILE MERGED
2005/10/05 10:32:31 nn 1.21.18.1: #i53407# allow empty name for member
Diffstat (limited to 'sc/source/filter/xml/xmldpimp.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmldpimp.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index a96dc201f042..33ebc8af441f 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmldpimp.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:06:08 $ + * last change: $Author: hr $ $Date: 2005-10-25 11:00:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1354,7 +1354,10 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), - pDataPilotField(pTempDataPilotField) + pDataPilotField(pTempDataPilotField), + bDisplay( sal_True ), + bDisplayDetails( sal_True ), + bHasName( sal_False ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotMemberAttrTokenMap(); @@ -1371,6 +1374,7 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, case XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME : { sName = sValue; + bHasName = sal_True; } break; case XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY : @@ -1406,7 +1410,7 @@ SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( USHORT nPre void ScXMLDataPilotMemberContext::EndElement() { - if (sName.getLength()) + if (bHasName) // #i53407# don't check sName, empty name is allowed { ScDPSaveMember* pMember = new ScDPSaveMember(String(sName)); pMember->SetIsVisible(bDisplay); |