diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:43:03 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:43:03 +0000 |
commit | d627bd17ab3b9bff3ccccb22f0db84271163ff39 (patch) | |
tree | 7fadc6cfe494fc86f2215b3e198a519f48afb4c1 /forms/source | |
parent | 8f09c47e5c38788bfde35ec110f13afd80bfe961 (diff) |
INTEGRATION: CWS eforms2 (1.3.4); FILE MERGED
2004/07/19 15:18:43 fs 1.3.4.2: during #114856#: properly determine who instigated a setControlValue, so that we can propagate the values to appropriate interested parties / while we were here: make some attributes private ...
2004/07/12 13:57:03 fs 1.3.4.1: formal support of the BindableIntegerValueRange service
Diffstat (limited to 'forms/source')
-rw-r--r-- | forms/source/component/scrollbar.cxx | 11 | ||||
-rw-r--r-- | forms/source/component/spinbutton.cxx | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 1be80eea0f70..f77375403436 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scrollbar.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-04-02 10:56:46 $ + * last change: $Author: obo $ $Date: 2004-11-16 10:42:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,6 @@ namespace frm { if ( ::rtl::math::isInf( nExternalValue ) ) { - // set the minimum or maximum of the scroll values ::rtl::OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue ) ? _rMinValueName : _rMaxValueName; @@ -128,7 +127,7 @@ namespace frm else { if ( _rxProperties.is() ) - _rxProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ) ) >>= nControlValue; + _rxProperties->getPropertyValue( _rMinValueName ) >>= nControlValue; } } @@ -182,7 +181,7 @@ namespace frm } //-------------------------------------------------------------------- - IMPLEMENT_SERVICE_REGISTRATION_1( OScrollBarModel, OControlModel, FRM_SUN_COMPONENT_SCROLLBAR ) + IMPLEMENT_SERVICE_REGISTRATION_2( OScrollBarModel, OControlModel, FRM_SUN_COMPONENT_SCROLLBAR, BINDABLE_INTEGER_VALUE_RANGE ) // note that we're passing OControlModel as "base class". This is because // OBoundControlModel, our real base class, claims to support the DataAwareControlModel // service, which isn't really true for us. We only derive from this class @@ -355,7 +354,7 @@ namespace frm //-------------------------------------------------------------------- Any OScrollBarModel::translateExternalValueToControlValue( ) { - return translateExternalDoubleToControlIntValue( m_xExternalBinding, m_xAggregateSet, + return translateExternalDoubleToControlIntValue( getExternalValueBinding(), m_xAggregateSet, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) ); } diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 62bfc6e2c3dd..874ba5517e2d 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -2,9 +2,9 @@ * * $RCSfile: spinbutton.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-04-02 10:57:10 $ + * last change: $Author: obo $ $Date: 2004-11-16 10:43:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ namespace frm } //-------------------------------------------------------------------- - IMPLEMENT_SERVICE_REGISTRATION_1( OSpinButtonModel, OControlModel, FRM_SUN_COMPONENT_SPINBUTTON ) + IMPLEMENT_SERVICE_REGISTRATION_2( OSpinButtonModel, OControlModel, FRM_SUN_COMPONENT_SPINBUTTON, BINDABLE_INTEGER_VALUE_RANGE ) // note that we're passing OControlModel as "base class". This is because // OBoundControlModel, our real base class, claims to support the DataAwareControlModel // service, which isn't really true for us. We only derive from this class @@ -302,7 +302,7 @@ namespace frm //-------------------------------------------------------------------- Any OSpinButtonModel::translateExternalValueToControlValue( ) { - return translateExternalDoubleToControlIntValue( m_xExternalBinding, m_xAggregateSet, + return translateExternalDoubleToControlIntValue( getExternalValueBinding(), m_xAggregateSet, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) ); } |