cws tl78: merge with DEV300_m75

3 files changed, 61 insertions, 47 deletions

diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index b290decf664b..d330ed1655f8 100755
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -106,23 +106,24 @@ struct PasswordToOpenModifyDialog_Impl
 {
     Window *                    m_pParent;
 
+    FixedLine                   m_aFileEncryptionFL;
     FixedText                   m_aPasswdToOpenFT;
     Edit                        m_aPasswdToOpenED;
     FixedText                   m_aReenterPasswdToOpenFT;
     PasswordReenterEdit_Impl    m_aReenterPasswdToOpenED;
-    FixedImage                  m_aPasswdToOpenMatchFI;
+//    FixedImage                  m_aPasswdToOpenMatchFI;
     FixedText                   m_aPasswdNoteFT;
     FixedLine                   m_aButtonsFL;
     MoreButton                  m_aMoreFewerOptionsBTN;
     OKButton                    m_aOk;
     CancelButton                m_aCancel;
     FixedLine                   m_aFileSharingOptionsFL;
+    CheckBox                    m_aOpenReadonlyCB;
     FixedText                   m_aPasswdToModifyFT;
     Edit                        m_aPasswdToModifyED;
     FixedText                   m_aReenterPasswdToModifyFT;
     PasswordReenterEdit_Impl    m_aReenterPasswdToModifyED;
-    FixedImage                  m_aPasswdToModifyMatchFI;
-    CheckBox                    m_aOpenReadonlyCB;
+//    FixedImage                  m_aPasswdToModifyMatchFI;
 
 
     DECL_LINK( ModifyHdl, Edit * );
@@ -137,28 +138,31 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         sal_uInt16 nMinPasswdLen,
         sal_uInt16 nMaxPasswdLen ) :
     m_pParent( pParent ),
+    m_aFileEncryptionFL         ( pParent, CUI_RES( FL_FILE_ENCRYPTION ) ),
     m_aPasswdToOpenFT           ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ),
     m_aPasswdToOpenED           ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ),
     m_aReenterPasswdToOpenFT    ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ),
     m_aReenterPasswdToOpenED    ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ),
-    m_aPasswdToOpenMatchFI      ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ),
+//    m_aPasswdToOpenMatchFI      ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ),
     m_aPasswdNoteFT             ( pParent, CUI_RES( FT_PASSWD_NOTE ) ),
     m_aButtonsFL                ( pParent, CUI_RES( FL_BUTTONS ) ),
     m_aMoreFewerOptionsBTN      ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ),
     m_aOk                       ( pParent, CUI_RES( BTN_OK ) ),
     m_aCancel                   ( pParent, CUI_RES( BTN_CANCEL ) ),
     m_aFileSharingOptionsFL     ( pParent, CUI_RES( FL_FILE_SHARING_OPTIONS ) ),
+    m_aOpenReadonlyCB           ( pParent, CUI_RES( CB_OPEN_READONLY ) ),
     m_aPasswdToModifyFT         ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ),
     m_aPasswdToModifyED         ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ),
     m_aReenterPasswdToModifyFT  ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ),
-    m_aReenterPasswdToModifyED  ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ),
-    m_aPasswdToModifyMatchFI    ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ),
-    m_aOpenReadonlyCB           ( pParent, CUI_RES( CB_OPEN_READONLY ) )
+    m_aReenterPasswdToModifyED  ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) )
+//    m_aPasswdToModifyMatchFI    ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) )
 {
+/*
     const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) );
     m_aPasswdToOpenMatchFI.SetImage( aImage );
     m_aPasswdToModifyMatchFI.SetImage( aImage );
+*/
 
     m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) );
     m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) );
@@ -209,8 +213,8 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*
 
     m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty );
 
-    m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty );
-    m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty );
+//    m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty );
+//    m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty );
 
     return 0;
 }
diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc
index f61de3303e06..e0111aed0084 100755
--- a/cui/source/dialogs/passwdomdlg.hrc
+++ b/cui/source/dialogs/passwdomdlg.hrc
@@ -28,6 +28,7 @@
 #ifndef _CUI_PASSWDOMDLG_HRC_
 #define _CUI_PASSWDOMDLG_HRC_
 
+#define FL_FILE_ENCRYPTION              10
 #define FT_PASSWD_TO_OPEN               11
 #define ED_PASSWD_TO_OPEN               12
 #define FT_REENTER_PASSWD_TO_OPEN       13
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
index 3c26e9f2b23d..078d9662c4c9 100755
--- a/cui/source/dialogs/passwdomdlg.src
+++ b/cui/source/dialogs/passwdomdlg.src
@@ -32,56 +32,63 @@
 
 ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 {
-    Size = MAP_APPFONT( 171, 135 );
-    Text [ en-US ] = "Password";
+    Size = MAP_APPFONT( 171, 151 );
+    Text [ en-US ] = "Set Password";
 //    HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY;
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
 
-    FixedText FT_PASSWD_TO_OPEN
+    FixedLine FL_FILE_ENCRYPTION
     {
         Pos = MAP_APPFONT( 3, 3 );
-        Size = MAP_APPFONT( 145, 8 );
+        Size = MAP_APPFONT( 165, 8 );
+        Text [ en-US ] = "File encryption";
+    };
+
+    FixedText FT_PASSWD_TO_OPEN
+    {
+        Pos = MAP_APPFONT( 6, 17 );
+        Size = MAP_APPFONT( 159, 8 );
         Text [ en-US ] = "~Enter password to open";
         WordBreak = TRUE;
     };
 
     Edit ED_PASSWD_TO_OPEN
     {
-        Pos = MAP_APPFONT( 3, 14 );
-        Size = MAP_APPFONT( 145, 12 );
+        Pos = MAP_APPFONT( 6, 28 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
 
     FixedText FT_REENTER_PASSWD_TO_OPEN
     {
-        Pos = MAP_APPFONT( 3, 31 );
-        Size = MAP_APPFONT( 145, 8 );
+        Pos = MAP_APPFONT( 6, 45 );
+        Size = MAP_APPFONT( 159, 8 );
         Text [ en-US ] = "~Reenter password to open";
         WordBreak = TRUE;
     };
 
     Edit ED_REENTER_PASSWD_TO_OPEN
     {
-        Pos = MAP_APPFONT( 3, 42 );
-        Size = MAP_APPFONT( 145, 12 );
+        Pos = MAP_APPFONT( 6, 56 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
-
+/*
     FixedImage FI_PASSWD_TO_OPEN_MATCH
     {
         Pos = MAP_APPFONT ( 150, 42 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
     };
-
+*/
     FixedText FT_PASSWD_NOTE
     {
-        Pos = MAP_APPFONT( 3, 66 );
-        Size = MAP_APPFONT( 165, 4*8 );     // some extra space for translation in other languages
+        Pos = MAP_APPFONT( 6, 80 );
+        Size = MAP_APPFONT( 159, 4*8 );     // some extra space for translation in other languages
         Text [ en-US ] = "Note: If you lose or forget the password, it can not be recovered. "\
                 "It is advisable to keep passwords in a safe place. Passwords are "\
                 "case-sensitive.";
@@ -90,13 +97,13 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 
     FixedLine FL_BUTTONS
     {
-        Pos = MAP_APPFONT( 0, 103 );
+        Pos = MAP_APPFONT( 0, 117 );
         Size = MAP_APPFONT( 171, 8 );
     };
 
     MoreButton BTN_MORE_FEWER_OPTIONS
     {
-        Pos = MAP_APPFONT( 3 , 116 ) ;
+        Pos = MAP_APPFONT( 6 , 130 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
         Delta = 146 ;
         State = FALSE ;
@@ -104,69 +111,70 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT( 63, 116 );
+        Pos = MAP_APPFONT( 62, 130 );
         Size = MAP_APPFONT( 50, 14 );
         DefButton = TRUE ;
     };
 
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT( 118, 116 );
+        Pos = MAP_APPFONT( 115, 130 );
         Size = MAP_APPFONT( 50, 14 );
     };
 
     FixedLine FL_FILE_SHARING_OPTIONS
     {
-        Pos = MAP_APPFONT( 3, 140 );
+        Pos = MAP_APPFONT( 3, 154 );
         Size = MAP_APPFONT( 165, 8 );
         Text [ en-US ] = "File sharing options";
     };
 
+    CheckBox CB_OPEN_READONLY
+    {
+        Pos = MAP_APPFONT( 6, 170 );
+        Size = MAP_APPFONT( 159, 8 );
+
+        Text [ en-US ] = "Open file read-only";
+    };
+
     FixedText FT_PASSWD_TO_MODIFY
     {
-        Pos = MAP_APPFONT( 8, 156 );
-        Size = MAP_APPFONT( 140, 8 );
+        Pos = MAP_APPFONT( 6, 186 );
+        Size = MAP_APPFONT( 159, 8 );
         Text [ en-US ] = "Enter password to modify";
         WordBreak = TRUE;
     };
 
     Edit ED_PASSWD_TO_MODIFY
     {
-        Pos = MAP_APPFONT( 8, 166 );
-        Size = MAP_APPFONT( 140, 12 );
+        Pos = MAP_APPFONT( 6, 196 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
 
     FixedText FT_REENTER_PASSWD_TO_MODIFY
     {
-        Pos = MAP_APPFONT( 8, 184 );
-        Size = MAP_APPFONT( 140, 8 );
+        Pos = MAP_APPFONT( 6, 214 );
+        Size = MAP_APPFONT( 159, 8 );
         Text [ en-US ] = "Reenter password to modify";
         WordBreak = TRUE;
     };
 
     Edit ED_REENTER_PASSWD_TO_MODIFY
     {
-        Pos = MAP_APPFONT( 8, 194 );
-        Size = MAP_APPFONT( 140, 12 );
+        Pos = MAP_APPFONT( 6, 224 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
-
+/*
     FixedImage FI_PASSWD_TO_MODIFY_MATCH
     {
-        Pos = MAP_APPFONT ( 150, 194 ) ;
+        Pos = MAP_APPFONT ( 150, 224 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
     };
-
-    CheckBox CB_OPEN_READONLY
-    {
-        Pos = MAP_APPFONT( 8, 212 );
-        Size = MAP_APPFONT( 140, 8 );
-
-        Text [ en-US ] = "Recommend to open file read-only";
-    };
+*/
 
     String STR_PASSWD_MUST_BE_CONFIRMED
     {
@@ -182,7 +190,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
     {
         Text [ en-US ] = "Fewer ~Options" ;
     };
-
+/*
     Image IMG_PASSWD_MATCH
     {
         ImageBitmap = Bitmap { File = "apply.png"; };
@@ -192,5 +200,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
     {
         ImageBitmap = Bitmap { File = "apply_h.png"; };
     };
+*/
 };