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

[Cédric Bosdonnat]

 sfx2/inc/sfx2/sfx.hrc               |    4 +---
 sfx2/source/dialog/securitypage.cxx |    2 --
 sfx2/source/dialog/securitypage.src |    8 --------
 3 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 6cb5d7f676ae2fb8497a3aedcb1694d88da43a9b
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Oct 27 16:49:15 2010 +0200

    Fixed fdo#31075: Use "Enter Password" in all the dialogs

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 631b0ee..0978783 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -237,9 +237,7 @@
 #define TP_MANAGE_STYLES                    (RID_SFX_START+7)
 #define DLG_STYLE_DESIGNER					(RID_SFX_START+8)
 
-#define RID_SFX_PROTECT_RECORDS             (RID_SFX_START+216)
-#define RID_SFX_UNPROTECT_RECORDS           (RID_SFX_START+217)
-#define RID_SFX_INCORRECT_PASSWORD          (RID_SFX_START+218)
+#define RID_SFX_INCORRECT_PASSWORD          (RID_SFX_START+216)
 
 #define	STR_STYLE_FILTER_AUTO				(RID_SFX_START+9)
 #define	STR_STYLE_FILTER_USED				(RID_SFX_START+10)
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 8058dd9..ec18d94 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -130,8 +130,6 @@ static short lcl_GetPassword(
 {
     bool bRes = false;
     SfxPasswordDialog aPasswdDlg( pParent );
-    const String aTitle( SfxResId( bProtect ? RID_SFX_PROTECT_RECORDS : RID_SFX_UNPROTECT_RECORDS ) );
-    aPasswdDlg.SetText( aTitle );
     aPasswdDlg.SetMinLen( 1 );
     if (bProtect)
         aPasswdDlg.ShowExtras( SHOWEXTRAS_CONFIRM );
diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src
index 4818068..c118e9a 100644
--- a/sfx2/source/dialog/securitypage.src
+++ b/sfx2/source/dialog/securitypage.src
@@ -159,14 +159,6 @@ TabPage TP_DOCINFOSECURITY
     };
 };
 
-String RID_SFX_PROTECT_RECORDS
-{
-    Text [ en-US ] = "Protect Records" ;
-};
-String RID_SFX_UNPROTECT_RECORDS
-{
-    Text [ en-US ] = "Unprotect Records" ;
-};
 String RID_SFX_INCORRECT_PASSWORD
 {
     Text [ en-US ] = "Incorrect password" ;