diff options
| -rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 6 | ||||
| -rw-r--r-- | basctl/source/basicide/moduldlg.hxx | 2 | ||||
| -rw-r--r-- | include/svx/passwd.hxx | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index bc0d1ff5abcd..d9ca3cbc5670 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -706,9 +706,9 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void ) CheckButtons(); } -IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) +IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool ) { - long nRet = 0; + bool nRet = false; SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); @@ -721,7 +721,7 @@ IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) OUString aOldPassword( pDlg->GetOldPassword() ); OUString aNewPassword( pDlg->GetNewPassword() ); xPasswd->changeLibraryPassword( aLibName, aOldPassword, aNewPassword ); - nRet = 1; + nRet = true; } catch (...) { diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 1c56dced5993..d7e16514ad86 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -232,7 +232,7 @@ protected: DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void ); DECL_LINK( BasicSelectHdl, ListBox * ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); - DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * ); + DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool ); void CheckButtons(); void DeleteCurrent(); void NewLib(); diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 469f0db0b154..e4b1295000e7 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -35,17 +35,17 @@ class SVX_DLLPUBLIC SvxPasswordDialog : public SfxModalDialog private: VclPtr<FixedText> m_pOldFL; VclPtr<FixedText> m_pOldPasswdFT; - VclPtr<Edit> m_pOldPasswdED; - VclPtr<Edit> m_pNewPasswdED; - VclPtr<Edit> m_pRepeatPasswdED; - VclPtr<OKButton> m_pOKBtn; + VclPtr<Edit> m_pOldPasswdED; + VclPtr<Edit> m_pNewPasswdED; + VclPtr<Edit> m_pRepeatPasswdED; + VclPtr<OKButton> m_pOKBtn; - OUString aOldPasswdErrStr; - OUString aRepeatPasswdErrStr; + OUString aOldPasswdErrStr; + OUString aRepeatPasswdErrStr; - Link<> aCheckPasswordHdl; + Link<SvxPasswordDialog*,bool> aCheckPasswordHdl; - bool bEmpty; + bool bEmpty; DECL_LINK_TYPED(ButtonHdl, Button*, void); DECL_LINK(EditModifyHdl, void *); @@ -58,7 +58,7 @@ public: OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } OUString GetNewPassword() const { return m_pNewPasswdED->GetText(); } - void SetCheckPasswordHdl( const Link<>& rLink ) { aCheckPasswordHdl = rLink; } + void SetCheckPasswordHdl( const Link<SvxPasswordDialog*,bool>& rLink ) { aCheckPasswordHdl = rLink; } }; |