diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:02:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:02:58 +0000 |
| commit | ca3f6bcff58680f405282c810dc6cf6fc1feb7b8 (patch) | |
| tree | 66434dc2bed8a60ee33aba4adda5c6fdf3694338 /forms/source/component/Edit.cxx | |
| parent | bd566d8f8f8ed9cf471785edef14793c802cd6d0 (diff) | |
INTEGRATION: CWS dba20 (1.24.16); FILE MERGED
2004/11/29 09:21:59 oj 1.24.16.2: RESYNC: (1.24-1.25); FILE MERGED
2004/11/19 11:31:12 fs 1.24.16.1: #i37342# +NativeWidgetLook
Diffstat (limited to 'forms/source/component/Edit.cxx')
| -rw-r--r-- | forms/source/component/Edit.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index f7afc0caf..5bdbbabeb 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Edit.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2004-11-16 10:37:12 $ + * last change: $Author: obo $ $Date: 2005-01-05 12:02:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -484,10 +484,13 @@ void OEditModel::fillProperties( Sequence< Property >& _rAggregateProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) + // our aggregate is a rich text model, which also derives from OControlModel, as + // do we, so we need to remove some duplicate properties RemoveProperty( _rAggregateProps, PROPERTY_TABINDEX ); RemoveProperty( _rAggregateProps, PROPERTY_CLASSID ); RemoveProperty( _rAggregateProps, PROPERTY_NAME ); RemoveProperty( _rAggregateProps, PROPERTY_TAG ); + RemoveProperty( _rAggregateProps, PROPERTY_NATIVE_LOOK ); DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); |