diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:28:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:28:18 +0000 |
| commit | 1710005aaccb4674cf18906965af0529dd588d45 (patch) | |
| tree | b0b30f3210b118c39cc8aeb57541feecbd6b9171 /xmloff/source/style/xmlprcon.cxx | |
| parent | 984a21c1a53315fa82f3f4f62fc3064b7cf34038 (diff) | |
INTEGRATION: CWS oasis (1.3.282); FILE MERGED
2004/04/21 07:27:24 mib 1.3.282.1: - separated attribute lists for <*-properties> elements on import (#i20153#)
- replaced "style:text-backgroubnd-color" with "fo:background-color"
Diffstat (limited to 'xmloff/source/style/xmlprcon.cxx')
| -rw-r--r-- | xmloff/source/style/xmlprcon.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 0e294befc232..8d098c197384 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlprcon.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-03-16 14:20:19 $ + * last change: $Author: rt $ $Date: 2004-07-13 08:28:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,10 +76,12 @@ SvXMLPropertySetContext::SvXMLPropertySetContext( SvXMLImport& rImp, USHORT nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, + sal_uInt32 nFam, vector< XMLPropertyState > &rProps, const UniReference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nSIdx, sal_Int32 nEIdx ): SvXMLImportContext( rImp, nPrfx, rLName ), + nFamily( nFam ), rProperties( rProps ), xMapper ( rMap ), nStartIdx( nSIdx ), @@ -87,7 +89,8 @@ SvXMLPropertySetContext::SvXMLPropertySetContext( { xMapper->importXML( rProperties, xAttrList, GetImport().GetMM100UnitConverter(), - GetImport().GetNamespaceMap(), nStartIdx, nEndIdx ); + GetImport().GetNamespaceMap(), nFamily, + nStartIdx, nEndIdx ); } SvXMLPropertySetContext::~SvXMLPropertySetContext() @@ -102,7 +105,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( UniReference< XMLPropertySetMapper > aSetMapper( xMapper->getPropertySetMapper() ); sal_Int32 nEntryIndex = aSetMapper->GetEntryIndex( nPrefix, rLocalName, - nStartIdx ); + nFamily, nStartIdx ); if( ( nEntryIndex != -1 ) && (-1 == nEndIdx || nEntryIndex < nEndIdx ) && ( 0 != ( aSetMapper->GetEntryFlags( nEntryIndex ) |