4 files changed, 4 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 63235def840d..1c83d4b8af7e 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -43,8 +43,7 @@ namespace pcr
     IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void)
     {
         m_nActivePage = m_pPropBox->GetCurPage();
-        if (m_aPageActivationHandler.IsSet())
-            m_aPageActivationHandler.Call(NULL);
+        m_aPageActivationHandler.Call(NULL);
     }
 
 
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 5b9c0e648dd8..600bb7208404 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -149,10 +149,7 @@ namespace pcr
 
     IMPL_LINK( FieldLinkRow, OnFieldNameChanged, ComboBox*, /*_pBox*/ )
     {
-        if ( m_aLinkChangeHandler.IsSet() )
-            return m_aLinkChangeHandler.Call( this );
-
-        return 0L;
+        return m_aLinkChangeHandler.Call( this );
     }
 
     VCL_BUILDER_FACTORY(FieldLinkRow)
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 126ee9284956..5586aa3affda 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -511,8 +511,7 @@ namespace pcr
 
     IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void)
     {
-        if (m_aPageActivationHandler.IsSet())
-            m_aPageActivationHandler.Call(NULL);
+        m_aPageActivationHandler.Call(NULL);
     }
 
 
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index cb9f003007df..4aff1ef70d6c 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -309,8 +309,7 @@ namespace pcr
 
     void SQLCommandDesigner::impl_designerClosed_nothrow()
     {
-        if ( m_aCloseLink.IsSet() )
-            m_aCloseLink.Call( *this );
+        m_aCloseLink.Call( *this );
     }