diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-15 15:52:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-15 15:52:30 +0200 |
| commit | 7cd65eef1423beadb1072f2c5b86823b051ce95a (patch) | |
| tree | dc3095f268ffeb678d5c1ca21d71aa36541e53eb /forms | |
| parent | 40036fc228af31d84bc1d3a64af84ce03117fb37 (diff) | |
Simplify expression to fix bool/sal_Bool ambiguity
Change-Id: I249262779519934c3dacc9df76028a994187e3d6
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Button.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 3ede9e4b5b23..2c248d5a5c7f 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -713,7 +713,7 @@ void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled // enable or disable our peer, according to the new state Reference< XVclWindowPeer > xPeer( getPeer(), UNO_QUERY ); if ( xPeer.is() ) - xPeer->setProperty( PROPERTY_ENABLED, makeAny( m_bEnabledByPropertyValue ? _bEnabled : sal_False ) ); + xPeer->setProperty( PROPERTY_ENABLED, makeAny( m_bEnabledByPropertyValue && _bEnabled ) ); // if we're disabled according to our model's property, then // we don't care for the feature state, but *are* disabled. // If the model's property states that we're enabled, then we *do* |