Use typed TabControl::SetDeactivatePageHdl Link

Change-Id: I487aad5217cb685ece971717445a68b4fb3d2b3a

extensions/source/propctrlr/propertyeditor.cxx

@@ -516,19 +516,19 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate)
+    IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageDeactivate, TabControl *, bool)
     {
         // commit the data on the current (to-be-decativated) tab page
         // (79404)
         sal_Int32 nCurrentId = m_aTabControl->GetCurPageId();
         OBrowserPage* pCurrentPage = static_cast<OBrowserPage*>(m_aTabControl->GetTabPage((sal_uInt16)nCurrentId));
         if ( !pCurrentPage )
-            return 1L;
+            return true;
 
         if ( pCurrentPage->getListBox().IsModified() )
             pCurrentPage->getListBox().CommitModified();
 
-        return 1L;
+        return true;
     }
 
 

extensions/source/propctrlr/propertyeditor.hxx

@@ -139,7 +139,7 @@ namespace pcr
         void    setHelpLineLimits( OBrowserPage& _rPage, const void* );
 
     protected:
-        DECL_LINK(OnPageDeactivate, void *);
+        DECL_LINK_TYPED(OnPageDeactivate, TabControl *, bool);
         DECL_LINK(OnPageActivate, void *);
     };
 

filter/source/xsltdialog/xmlfiltertabdialog.cxx

@@ -305,9 +305,9 @@ IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
 
 
-IMPL_LINK( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, /* pTabCtrl */ )
+IMPL_LINK_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool )
 {
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

filter/source/xsltdialog/xmlfiltertabdialog.hxx

@@ -46,7 +46,7 @@ private:
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
 
     DECL_LINK( ActivatePageHdl, TabControl * );
-    DECL_LINK( DeactivatePageHdl, TabControl * );
+    DECL_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
     DECL_LINK(OkHdl, void *);
 
     ResMgr& mrResMgr;

framework/inc/classes/fwktabwindow.hxx

@@ -105,7 +105,7 @@ private:
     bool            RemoveEntry( sal_Int32 nIndex );
 
     DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *);
-    DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *);
+    DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool);
 
 public:
     FwkTabWindow( vcl::Window* pParent );

framework/inc/tabwin/tabwindow.hxx

@@ -110,7 +110,7 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
 
     protected:
         DECL_LINK( Activate, TabControl* );
-        DECL_LINK( Deactivate, TabControl* );
+        DECL_LINK_TYPED( Deactivate, TabControl*, bool );
 
     private:
 

framework/source/classes/fwktabwindow.cxx

@@ -278,10 +278,10 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
     return 1;
 }
 
-IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
+IMPL_LINK_NOARG_TYPED(FwkTabWindow, DeactivatePageHdl, TabControl *, bool)
 {
     m_aTabCtrl->BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE );
-    return 1;
+    return true;
 }
 
 void FwkTabWindow::AddEventListener( const Link<>& rEventListener )

framework/source/tabwin/tabwindow.cxx

@@ -243,7 +243,7 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
     return 1;
 }
 
-IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl )
+IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -253,7 +253,7 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl )
 
     implts_SendNotification( NOTIFY_DEACTIVATED, nPageId );
 
-    return 1;
+    return true;
 }
 
 // XInitilization

include/sfx2/tabdlg.hxx

@@ -90,7 +90,7 @@ friend class SfxTabDialogController;
     bool                bStandardPushed;
 
     DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
-    DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
+    DECL_DLLPRIVATE_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
     DECL_DLLPRIVATE_LINK(OkHdl, void *);
     DECL_DLLPRIVATE_LINK(ResetHdl, void *);
     DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *);

include/vcl/tabctrl.hxx

@@ -50,7 +50,7 @@ private:
     bool                mbSmallInvalidate;
     bool                mbLayoutDirty;
     Link<>              maActivateHdl;
-    Link<>              maDeactivateHdl;
+    Link<TabControl *, bool> maDeactivateHdl;
 
     using Control::ImplInitSettings;
     SAL_DLLPRIVATE void         ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
@@ -162,8 +162,7 @@ public:
 
     void                SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
     const Link<>&       GetActivatePageHdl() const { return maActivateHdl; }
-    void                SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
-    const Link<>&       GetDeactivatePageHdl() const { return maDeactivateHdl; }
+    void                SetDeactivatePageHdl( const Link<TabControl *, bool>& rLink ) { maDeactivateHdl = rLink; }
 
     // returns (control relative) bounding rectangle for the
     // character at index nIndex relative to the text of page nPageId

sd/source/ui/animations/CustomAnimationCreateDialog.cxx

@@ -599,11 +599,11 @@ IMPL_LINK_NOARG(CustomAnimationCreateDialog, implActivatePagekHdl)
     return 1;
 }
 
-IMPL_LINK_NOARG(CustomAnimationCreateDialog, implDeactivatePagekHdl)
+IMPL_LINK_NOARG_TYPED(CustomAnimationCreateDialog, implDeactivatePagekHdl, TabControl *, bool)
 {
     mfDuration = getCurrentPage()->getDuration();
     mbIsPreview = getCurrentPage()->getIsPreview();
-    return 1;
+    return true;
 }
 
 void CustomAnimationCreateDialog::preview( const CustomAnimationPresetPtr& pPreset ) const

sd/source/ui/animations/CustomAnimationCreateDialog.hxx

@@ -54,7 +54,7 @@ private:
     void storePosition();
 
     DECL_LINK(implActivatePagekHdl, void *);
-    DECL_LINK(implDeactivatePagekHdl, void *);
+    DECL_LINK_TYPED(implDeactivatePagekHdl, TabControl *, bool);
 
 private:
     VclPtr<CustomAnimationPane> mpPane;

sd/source/ui/dlg/headerfooterdlg.cxx

@@ -266,9 +266,9 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool)
 {
-    return sal_True;
+    return true;
 }
 
 IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)

sd/source/ui/inc/headerfooterdlg.hxx

@@ -38,7 +38,7 @@ class HeaderFooterDialog : public TabDialog
 {
 private:
     DECL_LINK( ActivatePageHdl, TabControl * );
-    DECL_LINK( DeactivatePageHdl, void * );
+    DECL_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
 
     DECL_LINK( ClickApplyToAllHdl, void * );
     DECL_LINK( ClickApplyHdl, void * );

sfx2/source/dialog/tabdlg.cxx

@@ -1193,7 +1193,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
 
 
-IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
+IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool )
 
 /*  [Description]
 
@@ -1210,7 +1210,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
     SfxTabPage *pPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
     DBG_ASSERT( pPage, "no active Page" );
     if (!pPage)
-        return sal_False;
+        return false;
 #ifdef DBG_UTIL
     Data_Impl* pDataObject = Find( pImpl->aData, pTabCtrl->GetCurPageId() );
     DBG_ASSERT( pDataObject, "no Data structure for current page" );
@@ -1272,9 +1272,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
         }
     }
     if ( nRet & SfxTabPage::LEAVE_PAGE )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }