diff options
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 3 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/passworddlg.cxx | 5 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 3 |
4 files changed, 3 insertions, 10 deletions
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 5e62a85b879c..7fcc7f2d7972 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -37,13 +37,12 @@ MasterPasswordDialog::MasterPasswordDialog const std::locale& rLocale ) : GenericDialogController(pParent, "uui/ui/masterpassworddlg.ui", "MasterPasswordDialog") - , rResLocale(rLocale) , m_xEDMasterPassword(m_xBuilder->weld_entry("password")) , m_xOKBtn(m_xBuilder->weld_button("ok")) { if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER ) { - OUString aErrorMsg(Translate::get(STR_ERROR_MASTERPASSWORD_WRONG, rResLocale)); + OUString aErrorMsg(Translate::get(STR_ERROR_MASTERPASSWORD_WRONG, rLocale)); std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(pParent, VclMessageType::Warning, VclButtonsType::Ok, aErrorMsg)); xErrorBox->run(); diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 5e0af686ee24..6e3e94f29fdd 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -26,8 +26,6 @@ class MasterPasswordDialog : public weld::GenericDialogController { private: - const std::locale& rResLocale; - std::unique_ptr<weld::Entry> m_xEDMasterPassword; std::unique_ptr<weld::Button> m_xOKBtn; diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 7fa17d356cbf..3e8d1550f6cd 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; PasswordDialog::PasswordDialog(weld::Window* pParent, - task::PasswordRequestMode nDialogMode, const std::locale& rLocale, + task::PasswordRequestMode nDialogMode, const std::locale& rResLocale, const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest) : GenericDialogController(pParent, "uui/ui/password.ui", "PasswordDialog") , m_xFTPassword(m_xBuilder->weld_label("newpassFT")) @@ -38,8 +38,7 @@ PasswordDialog::PasswordDialog(weld::Window* pParent, , m_xEDConfirmPassword(m_xBuilder->weld_entry("confirmpassEntry")) , m_xOKBtn(m_xBuilder->weld_button("ok")) , nMinLen(1) - , aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rLocale)) - , rResLocale(rLocale) + , aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rResLocale)) { // tdf#115964 we can be launched before the parent has resized to its final size m_xDialog->set_centered_on_parent(true); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index f376fb90a752..302c6cff5388 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -42,9 +42,6 @@ public: void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; } OUString GetPassword() const { return m_xEDPassword->get_text(); } - -private: - const std::locale& rResLocale; }; #endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX |