diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-18 13:15:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-18 13:15:07 +0000 |
| commit | 9490ffe41aefa8acdb32275846549b665ef2345a (patch) | |
| tree | 694ddd8d239347a2d287406657886bfdf6733d9e /sc/source/filter/xml/xmlstyli.cxx | |
| parent | 04eb09359ebed812eba774f52407ccd20b067437 (diff) | |
INTEGRATION: CWS doubleprop (1.54.94); FILE MERGED
2005/07/15 11:29:39 sab 1.54.94.1: #i46996#; remove duplicate properties
Diffstat (limited to 'sc/source/filter/xml/xmlstyli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index c49ed8ef7a0e..ed43ffe64484 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyli.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: vg $ $Date: 2005-03-23 13:02:45 $ + * last change: $Author: obo $ $Date: 2005-07-18 14:15:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -209,6 +209,10 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& // #i27594#; copy Value, but don't insert if (pAllBorderWidthProperty) pAllBorderWidthProperty->mnIndex = -1; + if (pAllBorderProperty) + pAllBorderProperty->mnIndex = -1; + if (pAllPaddingProperty) + pAllPaddingProperty->mnIndex = -1; for (i = 0; i < 4; ++i) { @@ -685,12 +689,42 @@ void XMLTableStyleContext::SetDefaults() void XMLTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue) { + XMLPropertyState* property = FindProperty(nContextID); + if (property) + property->mnIndex = -1; // #i46996# remove old property, so it isn't double sal_Int32 nIndex(static_cast<XMLTableStylesContext *>(pStyles)->GetIndex(nContextID)); DBG_ASSERT(nIndex != -1, "Property not found in Map"); XMLPropertyState aPropState(nIndex, rValue); GetProperties().push_back(aPropState); // has to be insertes in a sort order later } +XMLPropertyState* XMLTableStyleContext::FindProperty(const sal_Int16 nContextID) +{ + XMLPropertyState* pRet = NULL; + UniReference < XMLPropertySetMapper > xPrMap; + UniReference < SvXMLImportPropertyMapper > xImpPrMap = + pStyles->GetImportPropertyMapper( GetFamily() ); + DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); + if( xImpPrMap.is() ) + xPrMap = xImpPrMap->getPropertySetMapper(); + if( xPrMap.is() ) + { + ::std::vector< XMLPropertyState >::iterator endproperty(GetProperties().end()); + ::std::vector< XMLPropertyState >::iterator aIter(GetProperties().begin()); + while(!pRet && aIter != endproperty) + { + XMLPropertyState* property = &(*aIter); + if (property->mnIndex != -1 && xPrMap->GetEntryContextId(property->mnIndex) == nContextID) + { + pRet = property; + } + else + ++aIter; + } + } + return pRet; +} + // ---------------------------------------------------------------------------- SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext( |