forms/source/component/Button.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7cd65eef1423beadb1072f2c5b86823b051ce95a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 15 15:52:30 2014 +0200
Simplify expression to fix bool/sal_Bool ambiguity
Change-Id: I249262779519934c3dacc9df76028a994187e3d6
diff --git a/forms/source/component/Button.cxx
b/forms/source/component/Button.cxx
index 3ede9e4..2c248d5 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*
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
