summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx6
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx2
-rw-r--r--framework/inc/classes/fwktabwindow.hxx2
-rw-r--r--framework/inc/tabwin/tabwindow.hxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx4
-rw-r--r--framework/source/tabwin/tabwindow.cxx4
-rw-r--r--include/sfx2/tabdlg.hxx2
-rw-r--r--include/vcl/tabctrl.hxx5
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.hxx2
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx4
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx8
15 files changed, 26 insertions, 27 deletions
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index daa9e8c965f6..73d8389a6b9d 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/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;
}
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index cd519b8c2ff2..6fe279ba32b4 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/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 *);
};
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ff725cc040fe..5a63bbf066a6 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/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: */
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 221b704bb050..3b858a800094 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/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;
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 3e39087c2445..133782c22ef8 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/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 );
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 9edf5544f03d..e693ae20bb26 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/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:
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 605b7b18b3cf..9e16a6fc3324 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/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 )
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 97263ecc7462..44c87bb48300 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/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
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 6a4f18445159..a8f5526a7709 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/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 *);
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index df8e6ffb6669..82c3e96a3e22 100644
--- a/include/vcl/tabctrl.hxx
+++ b/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
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 6ab163cbb26f..d390643f38d5 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/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
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
index 68a5c811bc87..9b8ec8585607 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+++ b/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;
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 1714443c4371..a21e27efcb3e 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/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)
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 4206cd4dc62b..3926379a6eca 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/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 * );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 390afe6b4fe8..8684d5530ef9 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/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;
}
generated by cgit (git 2.34.1) at 2024-06-23 13:39:10 +0000