Skip to content

C
core
Kaydet (Commit) 7cd65eef authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Simplify expression to fix bool/sal_Bool ambiguity 

Change-Id: I249262779519934c3dacc9df76028a994187e3d6
üst 40036fc2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
forms/source/component/Button.cxx
Dosyayı görüntüle @ 7cd65eef
...@@ -713,7 +713,7 @@ void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled ...@@ -713,7 +713,7 @@ void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, bool _bEnabled
// enable or disable our peer, according to the new state // enable or disable our peer, according to the new state
Reference< XVclWindowPeer > xPeer( getPeer(), UNO_QUERY ); Reference< XVclWindowPeer > xPeer( getPeer(), UNO_QUERY );
if ( xPeer.is() ) 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 // if we're disabled according to our model's property, then
// we don't care for the feature state, but *are* disabled. // we don't care for the feature state, but *are* disabled.
// If the model's property states that we're enabled, then we *do* // If the model's property states that we're enabled, then we *do*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment