summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/print/genprnpsp.cxx5
-rw-r--r--vcl/generic/print/prtsetup.cxx4
-rw-r--r--vcl/generic/print/prtsetup.hxx2
-rw-r--r--vcl/inc/printdlg.hxx5
-rw-r--r--vcl/source/control/button.cxx12
-rw-r--r--vcl/source/window/btndlg.cxx4
-rw-r--r--vcl/source/window/layout.cxx3
-rw-r--r--vcl/source/window/menubarwindow.cxx10
-rw-r--r--vcl/source/window/menubarwindow.hxx8
-rw-r--r--vcl/source/window/printdlg.cxx27
-rw-r--r--vcl/workben/svpclient.cxx10
-rw-r--r--vcl/workben/vcldemo.cxx6
12 files changed, 45 insertions, 51 deletions
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 8c1a10a82c26..576a24fe27f1 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -97,7 +97,7 @@ namespace
VclPtr<Edit> m_pEdit;
OUString& m_rReturnValue;
- DECL_LINK( ClickBtnHdl, Button* );
+ DECL_LINK_TYPED( ClickBtnHdl, Button*, void );
public:
// parent window, Query text, initial value
@@ -130,7 +130,7 @@ namespace
SetText(rQuery);
}
- IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
+ IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void )
{
if (pButton == m_pOKButton)
{
@@ -139,7 +139,6 @@ namespace
}
else
EndDialog();
- return 0;
}
int QueryFaxNumber(OUString& rNumber)
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 8e2799cca27f..8e06a6f3a54a 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -133,7 +133,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
return 0;
}
-IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
+IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void )
{
if( pButton == m_pOKButton )
{
@@ -155,8 +155,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
}
else if( pButton == m_pCancelButton )
EndDialog();
-
- return 0;
}
/*
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 766237e5e25c..a9da270408cc 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -59,7 +59,7 @@ class RTSDialog : public TabDialog
bool mbDataModified;
DECL_LINK( ActivatePage, TabControl* );
- DECL_LINK( ClickButton, Button* );
+ DECL_LINK_TYPED( ClickButton, Button*, void );
// helper functions
void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 1f4f555223e9..65fbc597b3b0 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -241,7 +241,8 @@ namespace vcl
virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
DECL_LINK( SelectHdl, ListBox* );
- DECL_LINK( ClickHdl, Button* );
+ DECL_LINK_TYPED( ClickHdl, Button*, void );
+ DECL_LINK( ToggleHdl, void* );
DECL_LINK( ModifyHdl, Edit* );
DECL_LINK( UIOptionsChanged, void* );
@@ -274,7 +275,7 @@ namespace vcl
sal_Int32 mnCur;
sal_Int32 mnMax;
- DECL_LINK( ClickHdl, Button* );
+ DECL_LINK_TYPED( ClickHdl, Button*, void );
public:
PrintProgressDialog(vcl::Window* i_pParent, int i_nMax);
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a1c0dea3ccae..59fb68a01535 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -109,7 +109,7 @@ void Button::dispose()
void Button::SetCommandHandler(const OUString& aCommand)
{
maCommand = aCommand;
- SetClickHdl(Link<>(NULL, dispatchCommandHandler));
+ SetClickHdl( LINK( this, Button, dispatchCommandHandler) );
}
void Button::Click()
@@ -609,16 +609,12 @@ bool Button::set_property(const OString &rKey, const OString &rValue)
return true;
}
-sal_IntPtr Button::dispatchCommandHandler(void *, void *pCaller)
+IMPL_STATIC_LINK_TYPED( Button, dispatchCommandHandler, Button*, pButton, void )
{
- const Button *pButton = static_cast<Button*>(pCaller);
if (pButton == NULL)
- return 0;
-
- if (!comphelper::dispatchCommand(pButton->maCommand, uno::Sequence<beans::PropertyValue>()))
- return 0;
+ return;
- return 1;
+ comphelper::dispatchCommand(pButton->maCommand, uno::Sequence<beans::PropertyValue>());
}
void PushButton::ImplInitPushButtonData()
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 145b02f2df1d..9c02cf943922 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -211,7 +211,7 @@ void ButtonDialog::ImplPosControls()
mbFormat = false;
}
-IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( ButtonDialog, ImplClickHdl, Button*, pBtn, void )
{
for (auto & it : m_ItemList)
{
@@ -222,8 +222,6 @@ IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn )
break;
}
}
-
- return 0;
}
void ButtonDialog::Resize()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 090a70c9e570..ddc3a7a5c73b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2053,10 +2053,9 @@ void MessageDialog::response(short nResponseId)
EndDialog(nResponseId);
}
-IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton)
+IMPL_LINK_TYPED(MessageDialog, ButtonHdl, Button *, pButton, void)
{
response(get_response(pButton));
- return 0;
}
short MessageDialog::get_response(const vcl::Window *pWindow) const
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 2fcc536d09df..3a346827d7b9 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -289,14 +289,16 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent )
return 0;
}
-IMPL_LINK_NOARG(MenuBarWindow, FloatHdl)
+IMPL_LINK_NOARG_TYPED(MenuBarWindow, FloatHdl, Button*, void)
{
- return pMenu ? static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0;
+ if (pMenu)
+ static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu );
}
-IMPL_LINK_NOARG(MenuBarWindow, HideHdl)
+IMPL_LINK_NOARG_TYPED(MenuBarWindow, HideHdl, Button*, void)
{
- return pMenu ? static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0;
+ if (pMenu)
+ static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu );
}
void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst )
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 579e03b687f1..269651d6b12f 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -27,6 +27,8 @@
#include <vcl/toolbox.hxx>
#include <vcl/window.hxx>
+class Button;
+
/** Toolbox that holds the close button (right hand side of the menubar).
This is also used by the online update check; when an update is available, it
@@ -101,9 +103,9 @@ private:
virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
- DECL_LINK_TYPED(CloseHdl, ToolBox *, void);
- DECL_LINK(FloatHdl, void *);
- DECL_LINK(HideHdl, void *);
+ DECL_LINK_TYPED(CloseHdl, ToolBox*, void);
+ DECL_LINK_TYPED(FloatHdl, Button*, void);
+ DECL_LINK_TYPED(HideHdl, Button*, void);
DECL_LINK( ToolboxEventHdl, VclWindowEvent* );
DECL_LINK( ShowHideListener, VclWindowEvent* );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 05db2cf5bf87..c7995ac3c90e 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -673,14 +673,14 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
mpForwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
mpBackwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
- maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+ maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
maJobPage.mpSetupButton->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
maNUpPage.mpBorderCB->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
- maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
- maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
- maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
- maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
- maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+ maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+ maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+ maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+ maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+ maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
// setup modify hdl
mpPageEdit->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
maJobPage.mpCopyCountField->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
@@ -1006,7 +1006,7 @@ void PrintDialog::setupOptionalUI()
pVal->Value >>= bVal;
maNUpPage.mpBrochureBtn->Check( bVal );
maNUpPage.mpBrochureBtn->Enable( maPController->isUIOptionEnabled( aPropertyName ) && pVal != NULL );
- maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+ maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
maPropertyToWindowMap[ aPropertyName ].push_back( maNUpPage.mpBrochureBtn );
maControlToPropertyMap[maNUpPage.mpBrochureBtn] = aPropertyName;
@@ -1546,7 +1546,13 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox )
return 0;
}
-IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
+IMPL_LINK( PrintDialog, ToggleHdl, void*, pButton )
+{
+ ClickHdl(static_cast<Button*>(pButton));
+ return 0;
+}
+
+IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
{
if( pButton == mpOKButton || pButton == mpCancelButton )
{
@@ -1639,7 +1645,6 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
}
checkControlDependencies();
}
- return 0;
}
IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit )
@@ -1932,12 +1937,10 @@ void PrintProgressDialog::dispose()
ModelessDialog::dispose();
}
-IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton )
+IMPL_LINK_TYPED( PrintProgressDialog, ClickHdl, Button*, pButton, void )
{
if( pButton == mpButton )
mbCanceled = true;
-
- return 0;
}
void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 183b018a3983..0a0dad1ec222 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -113,9 +113,9 @@ public:
void parseList( const OString& rList );
static OString processCommand( const OString& rCommand );
- DECL_LINK( ListHdl, Button* );
+ DECL_LINK_TYPED( ListHdl, Button*, void );
DECL_LINK( SelectHdl, ListBox* );
- DECL_STATIC_LINK( MyWin, QuitHdl, Button* );
+ DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void );
};
void Main()
@@ -231,16 +231,14 @@ OString MyWin::processCommand( const OString& rCommand )
return aAnswer.makeStringAndClear();
}
-IMPL_LINK( MyWin, ListHdl, Button*, )
+IMPL_LINK_NOARG_TYPED( MyWin, ListHdl, Button*, void)
{
parseList( processCommand( "list" ) );
- return 0;
}
-IMPL_STATIC_LINK( MyWin, QuitHdl, Button*, )
+IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void)
{
processCommand( "quit" );
- return 0;
}
IMPL_LINK( MyWin, SelectHdl, ListBox*, )
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index e9c22eb1ab5c..4706d29f8a33 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1463,7 +1463,7 @@ class DemoWidgets : public WorkWindow
VclPtr<ComboBox> mpGLCombo;
VclPtr<PushButton> mpGLButton;
- DECL_LINK(GLTestClick, void *);
+ DECL_LINK_TYPED(GLTestClick, Button*, void);
public:
DemoWidgets() :
@@ -1554,7 +1554,7 @@ public:
static void leave() { OpenGLZone::leave(); }
};
-IMPL_LINK_NOARG(DemoWidgets,GLTestClick)
+IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void)
{
sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos();
@@ -1584,8 +1584,6 @@ IMPL_LINK_NOARG(DemoWidgets,GLTestClick)
if (bEnterLeave)
OpenGLZoneTest::leave();
-
- return 0;
}
class DemoPopup : public FloatingWindow
generated by cgit (git 2.34.1) at 2024-08-13 20:35:24 +0000