diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-11-26 17:26:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-11-26 17:26:32 +0000 |
| commit | bc208020fd9c83a817cdc94ad129abd54fd29c43 (patch) | |
| tree | 04fb9f8dd42679458df3b4346d6fd53a1eb32a4f | |
| parent | 8f3c62b1d9909a4034072ac83cec3f60ea3e62ff (diff) | |
INTEGRATION: CWS dbabetap2 (1.77.16); FILE MERGED
2004/11/12 16:38:27 fs 1.77.16.1: #i37089# in updateComplexPropertyDependencies, care whether a real property change instigated this
| -rw-r--r-- | extensions/source/propctrlr/formcontroller.cxx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 7c7a1b3c3..7f05b0ed5 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formcontroller.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: obo $ $Date: 2004-11-16 13:43:38 $ + * last change: $Author: kz $ $Date: 2004-11-26 18:26:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2454,7 +2454,7 @@ class EventsNameReplace_Impl: ::std::vector< sal_Int32 >::const_iterator aProperty = aActuatingProperties.begin(); ::std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); for ( ; aProperty != aActuatingProperties.end(); ++aProperty, ++aPropertyValue ) - updateDependentProperties( *aProperty, *aPropertyValue, *aPropertyValue ); + updateDependentProperties( *aProperty, *aPropertyValue, *aPropertyValue, false ); } SetCursorSource( sal_True, sal_True ); @@ -2816,7 +2816,7 @@ class EventsNameReplace_Impl: // care for any inter-property dependencies if ( bIsActuatingProperty ) - updateDependentProperties( nPropId, aValue, aOldValue ); + updateDependentProperties( nPropId, aValue, aOldValue, true ); // and display it again. This ensures proper formatting getPropertyBox()->SetPropertyValue( rName, sNewStrVal ); @@ -3221,7 +3221,7 @@ class EventsNameReplace_Impl: array + sizeof( array ) / sizeof( array[0] ) //------------------------------------------------------------------------ - void OPropertyBrowserController::updateDependentProperties( sal_Int32 _nPropId, const Any& _rNewValue, const Any& _rOldValue ) + void OPropertyBrowserController::updateDependentProperties( sal_Int32 _nPropId, const Any& _rNewValue, const Any& _rOldValue, bool _bIsRealPropertyChange ) { DBG_ASSERT( getPropertyBox(), "OPropertyBrowserController::updateDependentProperties: no view!" ); if ( !getPropertyBox() ) @@ -3301,14 +3301,17 @@ class EventsNameReplace_Impl: // also reset the list entries if the cell range is reset // #i28319# - 2004-04-27 - fs@openoffice.org - try + if ( _bIsRealPropertyChange ) { - if ( !xSource.is() ) - m_xPropValueAccess->setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< ::rtl::OUString >() ) ); - } - catch( const Exception& ) - { - OSL_ENSURE( sal_False, "OPropertyBrowserController::updateDependentProperties( ListCellRange ): caught an exception while resetting the string items!" ); + try + { + if ( !xSource.is() ) + m_xPropValueAccess->setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< ::rtl::OUString >() ) ); + } + catch( const Exception& ) + { + OSL_ENSURE( sal_False, "OPropertyBrowserController::updateDependentProperties( ListCellRange ): caught an exception while resetting the string items!" ); + } } } break; |