[Libreoffice-commits] .: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/helpid.h                    |    1 -
 sw/source/ui/dialog/uiregionsw.cxx |   16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit b5c3743c7b412bef17be019e39e3fb09e9b9cca3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 11 11:43:12 2012 +0100

    drop SwTestPasswdDlg in favour of SfxPasswordDialog
    
    Change-Id: I05b44c23cb38d89c7997e06634651325301ffbd8

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 246896a..a915108 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -330,7 +330,6 @@
 #define HID_LINGU_WORD_LANGUAGE                                 "SW_HID_LINGU_WORD_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_DLG_PASSWD_SECTION                                  "SW_HID_DLG_PASSWD_SECTION"
 #define HID_MD_COPY_TO_CLIPBOARD                                "SW_HID_MD_COPY_TO_CLIPBOARD"
 #define HID_MD_GLOS_IMPORT                                      "SW_HID_MD_GLOS_IMPORT"
 #define HID_SMARTTAG_MAIN                                       "SW_HID_SMARTTAG_MAIN"    // SMARTTAGS
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 87bf68e..2d1b6f4 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -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
 ----------------------------------------------------------------------------*/
@@ -448,7 +438,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
         if (!pRepr->GetTempPasswd().getLength()
             && pRepr->GetSectionData().GetPassword().getLength())
         {
-            SwTestPasswdDlg aPasswdDlg(this);
+            SfxPasswordDialog aPasswdDlg(this);
             bRet = sal_False;
             if (aPasswdDlg.Execute())
             {
@@ -1327,7 +1317,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
         {
             if(!pRepr->GetTempPasswd().getLength() || bChange)
             {
-                SwTestPasswdDlg aPasswdDlg(this);
+                SfxPasswordDialog aPasswdDlg(this);
                 aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
                 if(RET_OK == aPasswdDlg.Execute())
                 {
@@ -1782,7 +1772,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
     {
         if(!m_aNewPasswd.getLength() || bChange)
         {
-            SwTestPasswdDlg aPasswdDlg(this);
+            SfxPasswordDialog aPasswdDlg(this);
             aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
             if(RET_OK == aPasswdDlg.Execute())
             {