diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:06:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:06:04 +0000 |
| commit | b62450495fed49c86b1cc2f065efa25168217f34 (patch) | |
| tree | 19eb04a0d7573f8f1bf4401aee7bda3f06762305 /forms | |
| parent | dee77c54a06e0db6b10c5ed6477041ddd837777d (diff) | |
INTEGRATION: CWS dba24d (1.25.52); FILE MERGED
2007/11/20 11:52:08 fs 1.25.52.1: #i83774# strip ImageURL and ImagePosition
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Columns.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 24f946b958d9..8a73bac1e93b 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Columns.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2007-03-09 13:21:11 $ + * last change: $Author: rt $ $Date: 2008-01-30 08:06:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -405,6 +405,8 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B aForbiddenProperties.insert( PROPERTY_CONTROLLABEL ); aForbiddenProperties.insert( PROPERTY_RICH_TEXT ); aForbiddenProperties.insert( PROPERTY_VERTICALALIGN ); + aForbiddenProperties.insert( PROPERTY_IMAGE_URL ); + aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION ); if ( !bAllowDropDown ) aForbiddenProperties.insert( PROPERTY_DROPDOWN ); |