summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-21 15:50:01 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-21 15:50:01 +0000
commitc22d09aa0cdc2775fbfd7ead950aae70bac8360c (patch)
treeb405bc65bbd057316fc3289b3155914f9f8c214f /forms
parent457e59fbe5a6ff754bdcea72408225ccc577e307 (diff)
INTEGRATION: CWS dba22 (1.18.68); FILE MERGED
2004/12/29 12:10:24 fs 1.18.68.1: #i34551# columns do not know a vertical alignment
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/Columns.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index c51d7a425be4..8399ec15b946 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Columns.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: hr $ $Date: 2004-05-10 12:44:07 $
+ * last change: $Author: kz $ $Date: 2005-01-21 16:50:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -427,6 +427,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B
aForbiddenProperties.insert( PROPERTY_VSCROLL );
aForbiddenProperties.insert( PROPERTY_CONTROLLABEL );
aForbiddenProperties.insert( PROPERTY_RICH_TEXT );
+ aForbiddenProperties.insert( PROPERTY_VERTICALALIGN );
if ( !bAllowDropDown )
aForbiddenProperties.insert( PROPERTY_DROPDOWN );