diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-01 12:30:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:07:30 +0200 |
commit | ae0771c1581de76450b53c04268c0d8927fb3e0d (patch) | |
tree | d9087fc553dd04b7d0de267800b89fa3c75d59f6 /cui | |
parent | 578e0f22e13e14abfd03681a8b327a2989792444 (diff) |
nMinPasswdLen is "currently not supported" ever since
...the code's introduction with 7cd3ea794099e257d99748908855e61aa9df89eb
"#i109634# password to open/modify dialog", and demonstrated to be always
passed in as 0 with 673b436c3592c5747f3dce4947168d6fa3ba45ea
"loplugin:constantparam in vcl"
Change-Id: Ic7eee77b114f39a0c016148e9176f58dcfc53ebc
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/passwdomdlg.cxx | 9 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/passwdomdlg.hxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 8db8d4f633d3..21d058f3f4ff 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -52,12 +52,11 @@ struct PasswordToOpenModifyDialog_Impl DECL_LINK( OkBtnClickHdl, Button*, void ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, - sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); + sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, - sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : m_pParent( pParent ) @@ -85,8 +84,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_pReenterPasswdToModifyED->SetMaxTextLen( nMaxPasswdLen ); } - (void) nMinPasswdLen; // currently not supported - m_pPasswdToOpenED->GrabFocus(); m_pOptionsExpander->Enable(bIsPasswordToModify); @@ -139,12 +136,12 @@ IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void } PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - vcl::Window * pParent, sal_uInt16 nMinPasswdLen, + vcl::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) : SfxModalDialog( pParent, "PasswordDialog", "cui/ui/password.ui" ) { m_pImpl.reset(new PasswordToOpenModifyDialog_Impl(this, - nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) ); + nMaxPasswdLen, bIsPasswordToModify ) ); } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 4d07d9f9e5f8..cf945c40f955 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1535,7 +1535,7 @@ VclPtr<AbstractPasswordToOpenModifyDialog> AbstractDialogFactory_Impl::CreatePas vcl::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { - VclPtrInstance<PasswordToOpenModifyDialog> pDlg( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); + VclPtrInstance<PasswordToOpenModifyDialog> pDlg( pParent, nMaxPasswdLen, bIsPasswordToModify ); return VclPtr<AbstractPasswordToOpenModifyDialog_Impl>::Create( pDlg ); } diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 92ede8689816..529b67fb06ed 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -35,7 +35,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) = delete; public: - PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, + PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog() override; |