diff options
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/authfallbackdlg.cxx | 4 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.hxx | 4 | ||||
-rw-r--r-- | uui/source/logindlg.cxx | 6 | ||||
-rw-r--r-- | uui/source/logindlg.hxx | 6 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.cxx | 4 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.hxx | 4 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/nameclashdlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/nameclashdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/passworddlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.cxx | 8 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.hxx | 8 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.cxx | 4 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.hxx | 4 |
16 files changed, 32 insertions, 32 deletions
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index dedcdc8a1aee..230de254ca11 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -79,12 +79,12 @@ void AuthFallbackDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, OKHdl, Button *, void) +IMPL_LINK_NOARG ( AuthFallbackDlg, OKHdl, Button *, void) { EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, CancelHdl, Button *, void) +IMPL_LINK_NOARG ( AuthFallbackDlg, CancelHdl, Button *, void) { EndDialog(); } diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index 36d1b41adcb8..ff10407265b5 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -40,8 +40,8 @@ public: private: - DECL_LINK_TYPED ( OKHdl, Button *, void ); - DECL_LINK_TYPED ( CancelHdl, Button *, void ); + DECL_LINK ( OKHdl, Button *, void ); + DECL_LINK ( CancelHdl, Button *, void ); }; #endif // INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 740c847df5fd..1bdb85f91da5 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -151,7 +151,7 @@ void LoginDialog::SetRequest() m_pRequestInfo->SetText(aRequest); } -IMPL_LINK_NOARG_TYPED(LoginDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl, Button*, void) { // trim the strings m_pNameED->SetText(comphelper::string::strip(m_pNameED->GetText(), ' ')); @@ -159,7 +159,7 @@ IMPL_LINK_NOARG_TYPED(LoginDialog, OKHdl_Impl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(LoginDialog, PathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl, Button*, void) { try { @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED(LoginDialog, PathHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(LoginDialog, UseSysCredsHdl_Impl, Button*, void) +IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, Button*, void) { EnableUseSysCredsControls_Impl( m_pUseSysCredsCB->IsChecked() ); } diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 6d156a035784..ecef81e8dae5 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -62,9 +62,9 @@ class LoginDialog : public ModalDialog void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ); void SetRequest(); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(PathHdl_Impl, Button*, void); - DECL_LINK_TYPED(UseSysCredsHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(PathHdl_Impl, Button*, void); + DECL_LINK(UseSysCredsHdl_Impl, Button*, void); public: LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 9d6bf6e562d8..1064d140df6e 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -26,12 +26,12 @@ // MasterPasswordCreateDialog--------------------------------------------------- -IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, EditHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl, Edit&, void) { m_pOKBtn->Enable( m_pEDMasterPasswordCrt->GetText().getLength() >= 1 ); } -IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) { // compare both passwords and show message box if there are not equal!! if( m_pEDMasterPasswordCrt->GetText() == m_pEDMasterPasswordRepeat->GetText() ) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 48310e5fd276..38efbcb0ac46 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -37,8 +37,8 @@ private: VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditHdl_Impl, Edit&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(EditHdl_Impl, Edit&, void); public: MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr ); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 4f055e73c22b..625d307583c9 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -25,7 +25,7 @@ // MasterPasswordDialog--------------------------------------------------- -IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl, Button*, void) { EndDialog( RET_OK ); } diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 80da364af488..7dcc81074612 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -33,7 +33,7 @@ class MasterPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDMasterPassword; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); public: MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index e299b2709233..43a7351bdcb9 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -25,7 +25,7 @@ // NameClashDialog --------------------------------------------------------- -IMPL_LINK_TYPED( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) { long nRet = (long) ABORT; if ( m_pBtnRename == pBtn ) diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 0f98ed243bf1..3fb37ea1cdc5 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -39,7 +39,7 @@ class NameClashDialog : public ModalDialog OUString maSameName; OUString maNewName; - DECL_LINK_TYPED( ButtonHdl_Impl, Button *, void ); + DECL_LINK( ButtonHdl_Impl, Button *, void ); public: NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index bcba73ef1b26..490af47a9c16 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -102,7 +102,7 @@ void PasswordDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(PasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl, Button*, void) { bool bEDPasswdValid = m_pEDPassword->GetText().getLength() >= nMinLen; bool bPasswdMismatch = m_pEDConfirmPassword->GetText() != m_pEDPassword->GetText(); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 71c81eefec87..34627b9cfb64 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -40,7 +40,7 @@ class PasswordDialog : public ModalDialog OUString aPasswdMismatch; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); public: PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 08bf026b8796..17bbc161eb2d 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -113,7 +113,7 @@ void MacroWarning::SetDocumentURL( const OUString& rDocURL ) mpDocNameFI->SetText( rDocURL ); } -IMPL_LINK_NOARG_TYPED(MacroWarning, ViewSignsBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl, Button*, void) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -128,7 +128,7 @@ IMPL_LINK_NOARG_TYPED(MacroWarning, ViewSignsBtnHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(MacroWarning, EnableBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, Button*, void) { if( mbSignedMode && mpAlwaysTrustCB->IsChecked() ) { // insert path into trusted path list @@ -149,12 +149,12 @@ IMPL_LINK_NOARG_TYPED(MacroWarning, EnableBtnHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(MacroWarning, DisableBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, Button*, void) { EndDialog(); } -IMPL_LINK_NOARG_TYPED(MacroWarning, AlwaysTrustCheckHdl, Button*, void) +IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, Button*, void) { bool bEnable = ( mnActSecLevel < 2 || mpAlwaysTrustCB->IsChecked() ); mpEnableBtn->Enable( bEnable ); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index d71286d28a8d..fec9a519f55b 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -59,10 +59,10 @@ private: const bool mbShowSignatures; sal_Int32 mnActSecLevel; - DECL_LINK_TYPED( ViewSignsBtnHdl, Button*, void ); - DECL_LINK_TYPED( EnableBtnHdl, Button*, void ); - DECL_LINK_TYPED( DisableBtnHdl, Button*, void ); - DECL_LINK_TYPED( AlwaysTrustCheckHdl, Button*, void ); + DECL_LINK( ViewSignsBtnHdl, Button*, void ); + DECL_LINK( EnableBtnHdl, Button*, void ); + DECL_LINK( DisableBtnHdl, Button*, void ); + DECL_LINK( AlwaysTrustCheckHdl, Button*, void ); void InitControls(); diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 9184365a160c..e3e38e72062c 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -28,7 +28,7 @@ using namespace css; -IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl, Button*, void) { if ( m_pOptionButtonAccept->IsChecked() ) { @@ -40,7 +40,7 @@ IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) +IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) { uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures( css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 34911525b5d6..6dfd3bea41f1 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -39,8 +39,8 @@ private: const css::uno::Reference< css::uno::XComponentContext >& m_xContext; const css::uno::Reference< css::security::XCertificate >& m_rXCert; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ViewCertHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ViewCertHdl_Impl, Button*, void); public: UnknownAuthDialog(vcl::Window* pParent, |