summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
commitbd205223ec029a875c662474bb6d423d3cdd1994 (patch)
tree6531a292edb0d2a13103a4c55cbd10e7137b8a58 /uui
parent32781c2d268ed94eb46318a0398385baf31368c4 (diff)
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem.
Diffstat (limited to 'uui')
-rw-r--r--uui/source/logindlg.cxx6
-rw-r--r--uui/source/logindlg.hxx6
-rw-r--r--uui/source/masterpasscrtdlg.cxx4
-rw-r--r--uui/source/masterpasscrtdlg.hxx4
-rw-r--r--uui/source/masterpassworddlg.cxx2
-rw-r--r--uui/source/masterpassworddlg.hxx2
-rw-r--r--uui/source/newerverwarn.cxx4
-rw-r--r--uui/source/newerverwarn.hxx4
-rw-r--r--uui/source/passworddlg.cxx2
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/secmacrowarnings.cxx8
-rw-r--r--uui/source/sslwarndlg.cxx4
-rw-r--r--uui/source/sslwarndlg.hxx4
-rw-r--r--uui/source/unknownauthdlg.cxx4
-rw-r--r--uui/source/unknownauthdlg.hxx4
15 files changed, 30 insertions, 30 deletions
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index a90cd35efa85..78a29c86078e 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -211,7 +211,7 @@ void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled )
// -----------------------------------------------------------------------
-IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl)
{
// trim the strings
aNameED.SetText( aNameED.GetText().EraseLeadingChars().
@@ -224,7 +224,7 @@ IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl)
{
PathDialog* pDlg = new PathDialog( this, WB_3DLOOK );
pDlg->SetPath( aPathED.GetText() );
@@ -238,7 +238,7 @@ IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( LoginDialog, UseSysCredsHdl_Impl, CheckBox *, EMPTYARG )
+IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl)
{
EnableUseSysCredsControls_Impl( aUseSysCredsCB.IsChecked() );
return 1;
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 85f8b09e504d..7ce8d5c21593 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -76,9 +76,9 @@ class LoginDialog : public ModalDialog
void HideControls_Impl( sal_uInt16 nFlags );
void EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled );
- DECL_LINK( OKHdl_Impl, OKButton * );
- DECL_LINK( PathHdl_Impl, PushButton * );
- DECL_LINK( UseSysCredsHdl_Impl, CheckBox * );
+ DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK(PathHdl_Impl, void *);
+ DECL_LINK(UseSysCredsHdl_Impl, void *);
public:
LoginDialog( Window* pParent, sal_uInt16 nFlags,
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 8a1a040c78a6..352d0b354f6b 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -37,7 +37,7 @@
// -----------------------------------------------------------------------
-IMPL_LINK( MasterPasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
{
aOKBtn.Enable( aEDMasterPasswordCrt.GetText().Len() >= nMinLen );
return 0;
@@ -45,7 +45,7 @@ IMPL_LINK( MasterPasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( MasterPasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
{
// compare both passwords and show message box if there are not equal!!
if( aEDMasterPasswordCrt.GetText() == aEDMasterPasswordRepeat.GetText() )
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index d612ffe55e03..37698fc12fc6 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -59,8 +59,8 @@ private:
HelpButton aHelpBtn;
- DECL_LINK( OKHdl_Impl, OKButton * );
- DECL_LINK( EditHdl_Impl, Edit * );
+ DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK(EditHdl_Impl, void *);
public:
MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr );
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index e36e978c2613..ddfe0762ccce 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -36,7 +36,7 @@
// -----------------------------------------------------------------------
-IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl)
{
EndDialog( RET_OK );
return 1;
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index b0f988d348fa..163a9c48bd3e 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -47,7 +47,7 @@ class MasterPasswordDialog : public ModalDialog
HelpButton aHelpBtn;
- DECL_LINK( OKHdl_Impl, OKButton * );
+ DECL_LINK(OKHdl_Impl, void *);
public:
MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index d60c3d4ae3e4..8ecc3190e255 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -83,7 +83,7 @@ NewerVersionWarningDialog::~NewerVersionWarningDialog()
{
}
-IMPL_LINK( NewerVersionWarningDialog, UpdateHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
{
// detect execute path
::rtl::OUString sProgramPath;
@@ -166,7 +166,7 @@ IMPL_LINK( NewerVersionWarningDialog, UpdateHdl, PushButton*, EMPTYARG )
return 0;
}
-IMPL_LINK( NewerVersionWarningDialog, LaterHdl, CancelButton*, EMPTYARG )
+IMPL_LINK_NOARG(NewerVersionWarningDialog, LaterHdl)
{
EndDialog( RET_ASK_LATER );
return 0;
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index 0caac8e88951..14436d952f71 100644
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
@@ -47,8 +47,8 @@ namespace uui
::rtl::OUString m_sVersion;
- DECL_LINK( UpdateHdl, PushButton* );
- DECL_LINK( LaterHdl, CancelButton* );
+ DECL_LINK(UpdateHdl, void *);
+ DECL_LINK(LaterHdl, void *);
void InitButtonWidth();
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index ca94e181fa57..946e47e818c2 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -167,7 +167,7 @@ PasswordDialog::PasswordDialog(
}
-IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl)
{
bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen;
bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText();
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 0195ee5e7f5d..04572a474624 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -53,7 +53,7 @@ class PasswordDialog : public ModalDialog
String aPasswdMismatch;
- DECL_LINK( OKHdl_Impl, OKButton * );
+ DECL_LINK(OKHdl_Impl, void *);
public:
PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL,
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 1d3cc72648ef..39531ae6f3c8 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -118,7 +118,7 @@ void MacroWarning::SetDocumentURL( const String& rDocURL )
maDocNameFI.SetText( rDocURL );
}
-IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl)
{
DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" );
@@ -137,7 +137,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
return 0;
}
-IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl)
{
if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
{ // insert path into trusted path list
@@ -164,13 +164,13 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
return 0;
}
-IMPL_LINK( MacroWarning, DisableBtnHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl)
{
EndDialog( RET_CANCEL );
return 0;
}
-IMPL_LINK( MacroWarning, AlwaysTrustCheckHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl)
{
bool bEnable = ( mnActSecLevel < 2 || maAlwaysTrustCB.IsChecked() );
maEnableBtn.Enable( bEnable );
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 3ef1b4283e19..7fd1a83d66c0 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -36,7 +36,7 @@
// -----------------------------------------------------------------------
-IMPL_LINK( SSLWarnDialog, OKHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SSLWarnDialog, OKHdl_Impl)
{
EndDialog( RET_OK );
return 1;
@@ -44,7 +44,7 @@ IMPL_LINK( SSLWarnDialog, OKHdl_Impl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl)
{
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index a2be27e34233..0a41b8f0b208 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -62,8 +62,8 @@ private:
Window* m_pParent;
ResMgr* pResourceMgr;
- DECL_LINK( OKHdl_Impl, PushButton * );
- DECL_LINK( ViewCertHdl_Impl, PushButton * );
+ DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK(ViewCertHdl_Impl, void *);
public:
SSLWarnDialog( Window* pParent,
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 0aebd177b6c5..abd631f94b64 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -36,7 +36,7 @@
// -----------------------------------------------------------------------
-IMPL_LINK( UnknownAuthDialog, OKHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl)
{
if ( m_aOptionButtonAccept.IsChecked() )
{
@@ -51,7 +51,7 @@ IMPL_LINK( UnknownAuthDialog, OKHdl_Impl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
{
uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 1f183c0fe407..469bfebf3940 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -64,8 +64,8 @@ private:
Window* m_pParent;
ResMgr* pResourceMgr;
- DECL_LINK( OKHdl_Impl, PushButton * );
- DECL_LINK( ViewCertHdl_Impl, PushButton * );
+ DECL_LINK(OKHdl_Impl, void *);
+ DECL_LINK(ViewCertHdl_Impl, void *);
public:
UnknownAuthDialog( Window* pParent,