diff options
| author | Noel Power <noel.power@suse.com> | 2013-04-18 16:35:08 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-05-07 09:56:20 +0100 |
| commit | 99c3a99ff1cfef13c9081ec091ecc282d168406e (patch) | |
| tree | e0fa31cada23ab7ac40bb6a6695145efaaaff64b | |
| parent | ee84491568d72fe824bfc047fc17a3a978375855 (diff) | |
handle bool value for checkbox, radiobutton, togglebutton consistently
Change-Id: I1f9057e58fe3625e0b76a09d79c7c56e1838d98a
| -rw-r--r-- | vbahelper/source/msforms/vbacheckbox.cxx | 15 | ||||
| -rw-r--r-- | vbahelper/source/msforms/vbaradiobutton.cxx | 15 | ||||
| -rw-r--r-- | vbahelper/source/msforms/vbatogglebutton.cxx | 10 |
3 files changed, 22 insertions, 18 deletions
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index de32e34abe5d..63ee9fdd5cf6 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -65,17 +65,16 @@ ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcept sal_Int16 nValue = 0; sal_Int16 nOldValue = 0; m_xProps->getPropertyValue( STATE ) >>= nOldValue; - sal_Bool bValue = false; - if( _value >>= nValue ) - { - if( nValue == -1) - nValue = 1; - } - else if ( _value >>= bValue ) + if( !( _value >>= nValue ) ) { + sal_Bool bValue = false; + _value >>= bValue; if ( bValue ) - nValue = 1; + nValue = -1; } + + if( nValue == -1) + nValue = 1; m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) ); if ( nValue != nOldValue ) fireClickEvent(); diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index 10dabf8c8abe..f15d8175d3d1 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -66,17 +66,16 @@ ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExceptio sal_Int16 nOldValue = 0; m_xProps->getPropertyValue( STATE ) >>= nOldValue; - sal_Bool bValue = sal_False; - if( _value >>= nValue ) - { - if( nValue == -1) - nValue = 1; - } - else if ( _value >>= bValue ) + if( !( _value >>= nValue ) ) { + sal_Bool bValue = sal_False; + _value >>= bValue; if ( bValue ) - nValue = 1; + nValue = -1; } + + if( nValue == -1) + nValue = 1; m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) ); if ( nValue != nOldValue ) { diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 93073bc3739a..ce9c007ea5ad 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -66,11 +66,17 @@ void SAL_CALL ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nState = 0; - _value >>= nState; + if ( ! ( _value >>= nState ) ) + { + sal_Bool bState = false; + _value >>= bState; + if ( bState ) + nState = -1; + } SAL_INFO("vbahelper", "nState - " << nState ); nState = ( nState == -1 ) ? 1 : 0; SAL_INFO("vbahelper", "nState - " << nState ); - m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) ); + m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) ); } sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize() throw (uno::RuntimeException) |