Kaydet (Commit) b5c3743c authored tarafından Caolán McNamara's avatar Caolán McNamara

drop SwTestPasswdDlg in favour of SfxPasswordDialog

Change-Id: I05b44c23cb38d89c7997e06634651325301ffbd8
üst 1a3a7877
...@@ -330,7 +330,6 @@ ...@@ -330,7 +330,6 @@
#define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE" #define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE"
#define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE" #define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE"
#define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT" #define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT"
#define HID_DLG_PASSWD_SECTION "SW_HID_DLG_PASSWD_SECTION"
#define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD" #define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD"
#define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT" #define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT"
#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS #define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS
......
...@@ -136,16 +136,6 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pA ...@@ -136,16 +136,6 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pA
} }
} }
class SwTestPasswdDlg : public SfxPasswordDialog
{
public:
SwTestPasswdDlg(Window* pParent) :
SfxPasswordDialog(pParent)
{
SetHelpId(HID_DLG_PASSWD_SECTION);
}
};
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Description: user data class for region information Description: user data class for region information
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
...@@ -448,7 +438,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) ...@@ -448,7 +438,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
if (!pRepr->GetTempPasswd().getLength() if (!pRepr->GetTempPasswd().getLength()
&& pRepr->GetSectionData().GetPassword().getLength()) && pRepr->GetSectionData().GetPassword().getLength())
{ {
SwTestPasswdDlg aPasswdDlg(this); SfxPasswordDialog aPasswdDlg(this);
bRet = sal_False; bRet = sal_False;
if (aPasswdDlg.Execute()) if (aPasswdDlg.Execute())
{ {
...@@ -1327,7 +1317,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) ...@@ -1327,7 +1317,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
{ {
if(!pRepr->GetTempPasswd().getLength() || bChange) if(!pRepr->GetTempPasswd().getLength() || bChange)
{ {
SwTestPasswdDlg aPasswdDlg(this); SfxPasswordDialog aPasswdDlg(this);
aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM); aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
if(RET_OK == aPasswdDlg.Execute()) if(RET_OK == aPasswdDlg.Execute())
{ {
...@@ -1782,7 +1772,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) ...@@ -1782,7 +1772,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
{ {
if(!m_aNewPasswd.getLength() || bChange) if(!m_aNewPasswd.getLength() || bChange)
{ {
SwTestPasswdDlg aPasswdDlg(this); SfxPasswordDialog aPasswdDlg(this);
aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM); aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
if(RET_OK == aPasswdDlg.Execute()) if(RET_OK == aPasswdDlg.Execute())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment