summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/FormComponent.cxx4
-rw-r--r--forms/source/richtext/attributedispatcher.cxx2
-rw-r--r--forms/source/xforms/namedcollection.hxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 1b978d15c151..cc27283a22dc 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -321,12 +321,12 @@ void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException, st
sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException, std::exception)
{
- return m_xControl.is() ? m_xControl->isDesignMode() : sal_True;
+ return !m_xControl.is() || m_xControl->isDesignMode();
}
sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException, std::exception)
{
- return m_xControl.is() ? m_xControl->isTransparent() : sal_True;
+ return !m_xControl.is() || m_xControl->isTransparent();
}
OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext,
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index e6493b92519d..971d66a43b6c 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -68,7 +68,7 @@ namespace frm
FeatureStateEvent OAttributeDispatcher::buildStatusEvent() const
{
FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
- aEvent.IsEnabled = getEditView() ? !getEditView()->IsReadOnly() : sal_False;
+ aEvent.IsEnabled = getEditView() && !getEditView()->IsReadOnly();
AttributeState aState;
if ( m_pMasterDispatcher )
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index dd4498d1e7e9..f411595310e6 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -127,7 +127,7 @@ public:
const OUString& aName )
throw( css::uno::RuntimeException ) SAL_OVERRIDE
{
- return hasItem( aName ) ? sal_True : sal_False;
+ return hasItem( aName );
}
};