basctl/source/basicide/moduldlg.cxx | 3 +--
basctl/source/basicide/moduldlg.hxx | 2 +-
extensions/source/propctrlr/propertyeditor.cxx | 3 +--
extensions/source/propctrlr/propertyeditor.hxx | 4 ++--
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 5 +----
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2 +-
framework/inc/classes/fwktabwindow.hxx | 2 +-
framework/inc/tabwin/tabwindow.hxx | 2 +-
framework/source/classes/fwktabwindow.cxx | 3 +--
framework/source/tabwin/tabwindow.cxx | 4 +---
include/sfx2/tabdlg.hxx | 4 ++--
include/sfx2/templatedlg.hxx | 2 +-
include/vcl/splitwin.hxx | 9 ++-------
include/vcl/tabctrl.hxx | 8 ++++----
reportdesign/source/ui/inc/DesignView.hxx | 2 +-
reportdesign/source/ui/report/DesignView.cxx | 4 +---
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 3 +--
sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 4 ++--
sd/source/ui/dlg/headerfooterdlg.cxx | 4 +---
sd/source/ui/inc/headerfooterdlg.hxx | 2 +-
sfx2/source/appl/newhelp.cxx | 3 +--
sfx2/source/appl/newhelp.hxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 12 +++++++-----
sfx2/source/doc/templatedlg.cxx | 4 +---
svx/source/form/datanavi.cxx | 4 +---
svx/source/inc/datanavi.hxx | 2 +-
vcl/generic/print/prtsetup.cxx | 6 ++----
vcl/generic/print/prtsetup.hxx | 2 +-
vcl/source/window/splitwin.cxx | 5 -----
29 files changed, 42 insertions(+), 70 deletions(-)
New commits:
commit 37603521c0a6a0a34174a5020a6999ffb9d041d8
Author: Noel Grandin <noelgran...@gmail.com>
Date: Wed Sep 2 14:31:19 2015 +0200
convert Link<> to typed
Change-Id: I8bea5ac685b0076649412bd95501461242797d77
Reviewed-on: https://gerrit.libreoffice.org/18266
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 5a2711a..4cec7d0 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -85,12 +85,7 @@ private:
mbFadeOutPressed:1,
mbFadeNoButtonMode:1,
mbNoAlign:1;
- Link<> maStartSplitHdl;
- Link<> maSplitHdl;
- Link<> maSplitResizeHdl;
- Link<> maAutoHideHdl;
- Link<> maFadeInHdl;
- Link<> maFadeOutHdl;
+ Link<SplitWindow*,void> maSplitHdl;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
@@ -200,7 +195,7 @@ public:
bool IsFadeNoButtonMode() const { return
mbFadeNoButtonMode; }
void SetAutoHideState( bool bAutoHide );
- void SetSplitHdl( const Link<>& rLink ) { maSplitHdl =
rLink; }
+ void SetSplitHdl( const Link<SplitWindow*,void>& rLink ) {
maSplitHdl = rLink; }
};
#endif // INCLUDED_VCL_SPLITWIN_HXX
diff --git a/reportdesign/source/ui/inc/DesignView.hxx
b/reportdesign/source/ui/inc/DesignView.hxx
index 55e5ab2..e756f8c 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -79,7 +79,7 @@ namespace rptui
DECL_LINK_TYPED(MarkTimeout, Idle *, void);
- DECL_LINK( SplitHdl, void* );
+ DECL_LINK_TYPED( SplitHdl, SplitWindow*, void );
void ImplInitSettings();
diff --git a/reportdesign/source/ui/report/DesignView.cxx
b/reportdesign/source/ui/report/DesignView.cxx
index 4a014c0..16feb17 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -403,7 +403,7 @@ void ODesignView::ImplInitSettings()
SetTextFillColor(
Application::GetSettings().GetStyleSettings().GetFaceColor() );
}
-IMPL_LINK_NOARG( ODesignView, SplitHdl )
+IMPL_LINK_NOARG_TYPED( ODesignView, SplitHdl, SplitWindow*, void )
{
const Size aOutputSize = GetOutputSizePixel();
const long nTest = aOutputSize.Width() *
m_aSplitWin->GetItemSize(TASKPANE_ID) / 100;
@@ -417,8 +417,6 @@ IMPL_LINK_NOARG( ODesignView, SplitHdl )
(void)nOldSplitPos;
getController().setSplitPos(nTest);
}
-
- return 0L;
}
void ODesignView::SelectAll(const sal_uInt16 _nObjectType)
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 830a449..edbd24f 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2215,7 +2215,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt
)
void SplitWindow::StartSplit()
{
- maStartSplitHdl.Call( this );
}
void SplitWindow::Split()
@@ -2225,22 +2224,18 @@ void SplitWindow::Split()
void SplitWindow::SplitResize()
{
- maSplitResizeHdl.Call( this );
}
void SplitWindow::AutoHide()
{
- maAutoHideHdl.Call( this );
}
void SplitWindow::FadeIn()
{
- maFadeInHdl.Call( this );
}
void SplitWindow::FadeOut()
{
- maFadeOutHdl.Call( this );
}
void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
commit 5beffcf3f1fd96fb9909b93759f8537417048863
Author: Noel Grandin <noelgran...@gmail.com>
Date: Wed Sep 2 09:20:08 2015 +0200
convert Link<> to typed
Change-Id: Ic0482dc5ed26eb2fc6ccde73022eff8b4786de83
Reviewed-on: https://gerrit.libreoffice.org/18258
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index d82e4c1..545e178 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -510,7 +510,7 @@ short OrganizeDialog::Execute()
}
-IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void
)
{
sal_uInt16 nId = pTabCtrl->GetCurPageId();
@@ -545,7 +545,6 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *,
pTabCtrl )
DBG_ASSERT( pNewTabPage, "Keine Page!" );
pTabCtrl->SetTabPage( nId, pNewTabPage );
}
- return 0;
}
diff --git a/basctl/source/basicide/moduldlg.hxx
b/basctl/source/basicide/moduldlg.hxx
index 61400d2..b4505b3 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -178,7 +178,7 @@ public:
virtual short Execute() SAL_OVERRIDE;
- DECL_LINK( ActivatePageHdl, TabControl * );
+ DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
};
class ObjectPage: public TabPage
diff --git a/extensions/source/propctrlr/propertyeditor.cxx
b/extensions/source/propctrlr/propertyeditor.cxx
index 60f72f4..126ee92 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -509,11 +509,10 @@ namespace pcr
}
- IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate)
+ IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void)
{
if (m_aPageActivationHandler.IsSet())
m_aPageActivationHandler.Call(NULL);
- return 0L;
}
diff --git a/extensions/source/propctrlr/propertyeditor.hxx
b/extensions/source/propctrlr/propertyeditor.hxx
index e202095..7d457ce 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -137,8 +137,8 @@ namespace pcr
void setHelpLineLimits( OBrowserPage& _rPage, const void* );
protected:
- DECL_LINK_TYPED(OnPageDeactivate, TabControl *, bool);
- DECL_LINK(OnPageActivate, void *);
+ DECL_LINK_TYPED(OnPageDeactivate, TabControl*, bool);
+ DECL_LINK_TYPED(OnPageActivate, TabControl*, void);
};
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 0f63a58..0d39fdd 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -292,14 +292,11 @@ IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*,
void)
-IMPL_STATIC_LINK(
- XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *,
pTabCtrl, void )
{
const sal_uInt16 nId = pTabCtrl->GetCurPageId();
TabPage* pTabPage = pTabCtrl->GetTabPage( nId );
pTabPage->Show();
-
- return 0;
}
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 616ec54..1ef0a6a 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -45,7 +45,7 @@ public:
private:
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
mxContext;
- DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl * );
+ DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl*,
void );
DECL_LINK_TYPED(OkHdl, Button*, void);
ResMgr& mrResMgr;
diff --git a/framework/inc/classes/fwktabwindow.hxx
b/framework/inc/classes/fwktabwindow.hxx
index 133782c..92976b8 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -104,7 +104,7 @@ private:
TabEntry* FindEntry( sal_Int32 nIndex ) const;
bool RemoveEntry( sal_Int32 nIndex );
- DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *);
+ DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl *, void);
DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool);
public:
diff --git a/framework/inc/tabwin/tabwindow.hxx
b/framework/inc/tabwin/tabwindow.hxx
index 9bdc6a8..ef01faa 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -109,7 +109,7 @@ class TabWindow : public
::com::sun::star::lang::XTypeProvider ,
virtual void SAL_CALL windowHidden( const css::lang::EventObject&
aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- DECL_LINK( Activate, TabControl* );
+ DECL_LINK_TYPED( Activate, TabControl*, void );
DECL_LINK_TYPED( Deactivate, TabControl*, bool );
private:
diff --git a/framework/source/classes/fwktabwindow.cxx
b/framework/source/classes/fwktabwindow.cxx
index e6cc7e3..b74c820 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -256,7 +256,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
return pEntry;
}
-IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
+IMPL_LINK_NOARG_TYPED(FwkTabWindow, ActivatePageHdl, TabControl*, void)
{
const sal_uInt16 nId = m_aTabCtrl->GetCurPageId();
FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl->GetTabPage(
nId ) );
@@ -275,7 +275,6 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
pTabPage->ActivatePage();
}
m_aTabCtrl->BroadcastEvent( VCLEVENT_TABPAGE_ACTIVATE );
- return 1;
}
IMPL_LINK_NOARG_TYPED(FwkTabWindow, DeactivatePageHdl, TabControl *, bool)
diff --git a/framework/source/tabwin/tabwindow.cxx
b/framework/source/tabwin/tabwindow.cxx
index 245de85..fedbd74 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -226,7 +226,7 @@ void TabWindow::implts_SendNotification( Notification
eNotify, sal_Int32 ID, con
// Links
-IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
+IMPL_LINK_TYPED( TabWindow, Activate, TabControl*, pTabControl, void )
{
/* SAFE AREA
-----------------------------------------------------------------------------------------------
*/
SolarMutexClearableGuard aLock;
@@ -239,8 +239,6 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
/* SAFE AREA
-----------------------------------------------------------------------------------------------
*/
implts_SendNotification( NOTIFY_ACTIVATED, nPageId );
-
- return 1;
}
IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool )
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 3f5fa99..603b1bd 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -89,8 +89,8 @@ friend class SfxTabDialogController;
bool bItemsReset;
bool bStandardPushed;
- DECL_DLLPRIVATE_LINK(ActivatePageHdl, TabControl * );
- DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool );
+ DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void );
+ DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool );
DECL_DLLPRIVATE_LINK_TYPED(OkHdl, Button*, void);
DECL_DLLPRIVATE_LINK_TYPED(ResetHdl, Button*, void);
DECL_DLLPRIVATE_LINK_TYPED(BaseFmtHdl, Button*, void);
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 9272c90..ceb96c2 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -57,7 +57,7 @@ public:
void setDocumentModel (const
com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel);
- DECL_LINK(ActivatePageHdl, void*);
+ DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void);
private:
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index cf6135e..69e4886 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -58,8 +58,8 @@ private:
bool mbRestoreUnqId;
bool mbSmallInvalidate;
bool mbLayoutDirty;
- Link<> maActivateHdl;
- Link<TabControl *, bool> maDeactivateHdl;
+ Link<TabControl*,void> maActivateHdl;
+ Link<TabControl*,bool> maDeactivateHdl;
using Control::ImplInitSettings;
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
@@ -161,8 +161,8 @@ public:
const OString& GetHelpId() const
{ return Control::GetHelpId(); }
- void SetActivatePageHdl( const Link<>& rLink ) {
maActivateHdl = rLink; }
- void SetDeactivatePageHdl( const Link<TabControl *, bool>&
rLink ) { maDeactivateHdl = rLink; }
+ void SetActivatePageHdl( const Link<TabControl*,void>&
rLink ) { maActivateHdl = rLink; }
+ 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 db86cd5..169c774 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -589,11 +589,10 @@ double CustomAnimationCreateDialog::getSelectedDuration()
const
return getCurrentPage()->getDuration();
}
-IMPL_LINK_NOARG(CustomAnimationCreateDialog, implActivatePagekHdl)
+IMPL_LINK_NOARG_TYPED(CustomAnimationCreateDialog, implActivatePagekHdl,
TabControl*, void)
{
getCurrentPage()->setDuration( mfDuration );
getCurrentPage()->setIsPreview( mbIsPreview );
- return 1;
}
IMPL_LINK_NOARG_TYPED(CustomAnimationCreateDialog, implDeactivatePagekHdl,
TabControl *, bool)
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
index 9b8ec85..4ad4d59 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
@@ -53,8 +53,8 @@ private:
void setPosition();
void storePosition();
- DECL_LINK(implActivatePagekHdl, void *);
- DECL_LINK_TYPED(implDeactivatePagekHdl, TabControl *, bool);
+ DECL_LINK_TYPED(implActivatePagekHdl, TabControl*, 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 79ce991..9a9c382 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -255,15 +255,13 @@ void HeaderFooterDialog::dispose()
TabDialog::dispose();
}
-IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl,
void )
{
const sal_uInt16 nId = pTabCtrl->GetCurPageId();
TabPage* pTabPage = pTabCtrl->GetTabPage( nId );
pTabPage->Show();
maPBApply->Show( nId == mnSlidesId );
maPBApply->Enable( mpCurrentPage != NULL );
-
- return 0;
}
IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void)
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx
b/sd/source/ui/inc/headerfooterdlg.hxx
index 8a1d4fd..f6161c5 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -37,7 +37,7 @@ class HeaderFooterTabPage;
class HeaderFooterDialog : public TabDialog
{
private:
- DECL_LINK( ActivatePageHdl, TabControl * );
+ DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void );
DECL_LINK_TYPED( ClickApplyHdl, Button*, void );
DECL_LINK_TYPED( ClickCancelHdl, Button*, void );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f2106fc..00ef0bc 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1582,12 +1582,11 @@ HelpTabPage_Impl*
SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
return pPage;
}
-IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
+IMPL_LINK_TYPED( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *,
pTabCtrl, void )
{
sal_uInt16 nId = 0;
TabPage* pPage = GetCurrentPage( nId );
pTabCtrl->SetTabPage( nId, pPage );
- return 0;
}
IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl)
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 0d08861..fd5e3d6 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -313,7 +313,7 @@ private:
inline SearchTabPage_Impl* GetSearchPage();
inline BookmarksTabPage_Impl* GetBookmarksPage();
- DECL_LINK( ActivatePageHdl, TabControl* );
+ DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void );
DECL_LINK(SelectHdl, void *);
DECL_LINK_TYPED(InitHdl, Idle *, void);
DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void);
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d19a2ab..26a97b6 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1094,7 +1094,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*,
void)
-IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
/* [Description]
@@ -1127,7 +1127,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *,
pTabCtrl )
if (!pDataObject)
{
SAL_WARN("sfx.config", "Tab Page ID not known, this is pretty serious
and needs investigation");
- return 0;
+ return;
}
// Create TabPage if possible:
@@ -1189,9 +1189,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *,
pTabCtrl )
if ( pExampleSet )
pTabPage->ActivatePage( *pExampleSet );
- bool bReadOnly = pTabPage->IsReadOnly();
- ( bReadOnly || pImpl->bHideResetBtn ) ? m_pResetBtn->Hide() :
m_pResetBtn->Show();
- return 0;
+
+ if ( pTabPage->IsReadOnly() || pImpl->bHideResetBtn )
+ m_pResetBtn->Hide();
+ else
+ m_pResetBtn->Show();
}
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index ae677b1..94b6bd7 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -383,15 +383,13 @@ FILTER_APPLICATION
SfxTemplateManagerDlg::getCurrentFilter()
return FILTER_APPLICATION::NONE;
}
-IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl)
+IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ActivatePageHdl, TabControl*,
void)
{
mpCurView->filterItems(ViewFilter_Application(getCurrentFilter()));
mpCurView->showRootRegion(); // fdo#60586 show the root region of the
applied filter
if (mpSearchView->IsVisible())
SearchUpdateHdl(NULL);
-
- return 0;
}
void SfxTemplateManagerDlg::readSettings ()
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 1648055..875e928 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1799,7 +1799,7 @@ namespace svxform
return 0;
}
- IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl)
+ IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*,
void)
{
sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
@@ -1809,8 +1809,6 @@ namespace svxform
if ( m_xDataContainer.is() && !pPage->HasModel() )
SetPageModel();
}
-
- return 0;
}
IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, UpdateHdl, Timer *, void)
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 88e8d7d..a6e82f9 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -350,7 +350,7 @@ namespace svxform
DECL_LINK( ModelSelectHdl, ListBox * );
DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
DECL_LINK( MenuActivateHdl, MenuButton * );
- DECL_LINK(ActivatePageHdl, void *);
+ DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void);
DECL_LINK_TYPED(UpdateHdl, Timer *, void);
XFormsPage* GetCurrentPage( sal_uInt16& rCurId );
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 8e06a6f..ac21de6 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -107,10 +107,10 @@ void RTSDialog::dispose()
TabDialog::dispose();
}
-IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
+IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void )
{
if( pTabCtrl != m_pTabControl )
- return 0;
+ return;
sal_uInt16 nId = m_pTabControl->GetCurPageId();
OString sPage = m_pTabControl->GetPageName(nId);
@@ -129,8 +129,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
if (sPage == "paper")
m_pPaperPage->update();
}
-
- return 0;
}
IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void )
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index a9da270..5e35f60 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -58,7 +58,7 @@ class RTSDialog : public TabDialog
bool mbDataModified;
- DECL_LINK( ActivatePage, TabControl* );
+ DECL_LINK_TYPED( ActivatePage, TabControl*, void );
DECL_LINK_TYPED( ClickButton, Button*, void );
// helper functions
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
