diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 08:42:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 08:42:02 +0000 |
| commit | ee93663d8ef525f60fa3316e31524d342b1740c2 (patch) | |
| tree | d5cc4979611ad1a3bac2b23271cb0cf3d65456da | |
| parent | e18ae68046c563493a0789a8382e7f5d633f02ac (diff) | |
INTEGRATION: CWS dba23a (1.33.56); FILE MERGED
2007/03/22 20:34:20 fs 1.33.56.3: #i10000#
2007/03/22 20:31:16 fs 1.33.56.2: #i74087#
2007/03/14 14:23:02 fs 1.33.56.1: copying property-bag related changes from CWS hb02 to CWS dba23a - in preparation of some bug fixes
| -rw-r--r-- | xmloff/source/forms/propertyexport.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index bbdf8855ddb8..b7c384e78d11 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propertyexport.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2007-03-09 13:05:53 $ + * last change: $Author: kz $ $Date: 2007-05-10 09:42:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -297,10 +297,14 @@ namespace xmloff const Property* pProperties = aProperties.getConstArray(); for (sal_Int32 i=0; i<aProperties.getLength(); ++i, ++pProperties) { - static sal_Int32 nExcludeIndicator = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; - if (pProperties->Attributes & nExcludeIndicator) - // no readonly props, no transient props + // no transient props + if ( pProperties->Attributes & PropertyAttribute::TRANSIENT ) continue; + // no read-only props + if ( ( pProperties->Attributes & PropertyAttribute::READONLY ) != 0 ) + // except they're dynamically added + if ( ( pProperties->Attributes & PropertyAttribute::REMOVEABLE ) == 0 ) + continue; m_aRemainingProps.insert(pProperties->Name); } } |