diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:35:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:35:56 +0000 |
| commit | c6abe74ca203d112e361fcd0f950a781f7373921 (patch) | |
| tree | 2c83288e3244460a9d5a808502402b1b33ac1650 | |
| parent | 911103d16f492b69f478b90ad57493e4b5023bf5 (diff) | |
INTEGRATION: CWS dba202d (1.42.40); FILE MERGED
2006/01/24 09:15:49 fs 1.42.40.3: RESYNC: (1.42-1.45); FILE MERGED
2006/01/23 13:26:17 fs 1.42.40.2: #i61048# #i61049# translateControlValueToValidatableValue: only use external value if we have an external binding
2006/01/04 11:02:14 fs 1.42.40.1: #i59877# better (assertion) diagnostics when catching an exception
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index c1c927657b43..3922d42bfc34 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FormComponent.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: obo $ $Date: 2006-01-19 15:37:21 $ + * last change: $Author: kz $ $Date: 2006-01-31 18:35:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1878,12 +1878,6 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt if ( evt.PropertyName.equals( PROPERTY_READONLY ) ) { sBindingControlledProperty = PROPERTY_READONLY; -#if FS_PRIV_DEBUG - sal_Bool bValue = sal_False; - OSL_VERIFY( evt.NewValue >>= bValue ); - setPropertyValue( PROPERTY_BACKGROUNDCOLOR, makeAny( sal_Int32( bValue ? 0xFF0000 : 0xFFFFFF ) ) ); - setPropertyValue( PROPERTY_TEXTCOLOR, makeAny( sal_Int32( bValue ? 0x000000 : 0x00000 ) ) ); -#endif } else if ( evt.PropertyName.equals( PROPERTY_RELEVANT ) ) { @@ -2729,7 +2723,10 @@ Any OBoundControlModel::translateControlValueToExternalValue( ) const //------------------------------------------------------------------------------ Any OBoundControlModel::translateControlValueToValidatableValue( ) const { - return translateControlValueToExternalValue(); + OSL_PRECOND( m_xValidator.is(), "OBoundControlModel::translateControlValueToValidatableValue: no validator, so why should I?" ); + if ( m_xValidator == m_xExternalBinding ) + return translateControlValueToExternalValue(); + return getControlValue(); } //------------------------------------------------------------------------------ |