CWS-TOOLING: integrate CWS fwk116

2009-09-03 Mikhail Voytenko #i101453# write the default values for old entries
2009-09-03 Mikhail Voytenko #i101453# let the new default value be used
2009-09-03 Mikhail Voytenko #i101453# revert the change for xslt-transformation, the duplicate nodes should not be allowed
2009-09-03 Mikhail Voytenko #i101453# allow duplicate nodes for different modules
2009-09-03 Mikhail Voytenko #i101453# fix the special mac installation
2009-09-02 Mikhail Voytenko #i101453# correct the usage of configuration files
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i96918# try to open the file for editing always
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-01 Mikhail Voytenko #i10000# fix typo
2009-08-30 Mikhail Voytenko Rebase on DEV300_m56
2009-08-19 Mikhail Voytenko #i101732# do not generate a transparent bitmap for thumbnail
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-07 Mikhail Voytenko #i103617# fix warning
2009-07-31 Carsten Driesner #i103924# Fix wrong number of arguments
2009-07-31 Mikhail Voytenko #i101207# integrate the patch
2009-07-31 Mikhail Voytenko #i103783# integrate the patch; get rid of CRLF
2009-07-31 Mikhail Voytenko #i97969# integrate the patch
2009-07-27 Carsten Driesner #i103423# Use correct request count in the ctor. Don't descrease value before checking the request count

6 files changed, 18 insertions, 18 deletions

diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 88e0993b8a2d..ad0f025febea 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -58,10 +58,10 @@ ModalDialog DLG_UUI_MASTERPASSWORD
         Size = MAP_APPFONT ( 169 , 13 ) ;
         PassWord = TRUE ;
     };
-    FixedLine FL_FIXED_LINE

-    {

-        Pos = MAP_APPFONT( 0, 35 );

-        Size = MAP_APPFONT( 175, 6 );

+    FixedLine FL_FIXED_LINE
+    {
+        Pos = MAP_APPFONT( 0, 35 );
+        Size = MAP_APPFONT( 175, 6 );
     };
 
     OKButton BTN_MASTERPASSWORD_OK
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 636cd4510ecc..a6db44697918 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -61,6 +61,7 @@ IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
         String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
         ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
         aErrorBox.Execute();
+        aEDPasswordCrt.SetText( String() );
         aEDPasswordRepeat.SetText( String() );
         aEDPasswordCrt.GrabFocus();
     }
@@ -81,7 +82,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr,
     ,aCancelBtn   ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr )    )
     ,aHelpBtn   ( this, ResId( BTN_PASSCRT_HELP, *pResMgr )    )
     ,pResourceMgr           ( pResMgr )
-    ,nMinLen( bMSCryptoMode ? 1 : 5 )
+    ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode
 {
     FreeResource();
 
diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc
index 54a09494e2ab..c36bec4bc9a6 100644
--- a/uui/source/passcrtdlg.hrc
+++ b/uui/source/passcrtdlg.hrc
@@ -43,5 +43,4 @@
 #define FT_PASSWORD_CRT          9
 #define FT_MSPASSWORD_WARNING 10
 
-
 #endif // UUI_PASSCRTDLG_HRC
diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
index 13f1ea688620..81629d955343 100644
--- a/uui/source/passcrtdlg.src
+++ b/uui/source/passcrtdlg.src
@@ -91,7 +91,7 @@ ModalDialog DLG_UUI_PASSWORD_CRT
     {
         Pos = MAP_APPFONT( 4, 64 );
         Size = MAP_APPFONT( 137, 40 );
-        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at least five characters long.";
+        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive.";
         WordBreak = TRUE;
     };
     FixedText FT_MSPASSWORD_WARNING
diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index 37938b0228ae..95a5e8a78673 100644
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.hrc
@@ -28,16 +28,16 @@
  *
  ************************************************************************/
 
-#ifndef PASSWORDDLG_HRC

-#define PASSWORDDLG_HRC

+#ifndef PASSWORDDLG_HRC
+#define PASSWORDDLG_HRC
 
-// local identifiers

-#define BTN_PASSWORD_OK     1

-#define ED_PASSWORD         2

-#define FT_PASSWORD 3

-#define FL_FIXED_LINE_1         4

-#define BTN_PASSWORD_HELP     5

-#define BTN_PASSWORD_CANCEL     6

+// local identifiers
+#define BTN_PASSWORD_OK     1
+#define ED_PASSWORD         2
+#define FT_PASSWORD 3
+#define FL_FIXED_LINE_1         4
+#define BTN_PASSWORD_HELP     5
+#define BTN_PASSWORD_CANCEL     6
 
 
-#endif // PASSWORDDLG_HRC

+#endif // PASSWORDDLG_HRC
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 41845b7488d1..338996a850f5 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -50,7 +50,7 @@ ModalDialog DLG_UUI_PASSWORD
     {
         Pos = MAP_APPFONT( 3, 4 );
         Size = MAP_APPFONT( 139, 28 );
-        Text [ en-US ] = "Enter password to open the file: \n";
+        Text [ en-US ] = "Enter password to open file: \n";
         WordBreak = TRUE;
     };