CWS-TOOLING: integrate CWS tkr20

2009-05-08 08:31:10 +0200 tkr  r271700 : ##i97329# fixed merge conflict during rebase
2009-05-07 08:30:15 +0200 tkr  r271622 : CWS-TOOLING: rebase CWS tkr20 to trunk@271427 (milestone: DEV300:m47)
2009-04-17 14:36:42 +0200 tkr  r270947 : #i73893# implemented the XCommandProcessor:Abort method
2009-03-20 14:08:15 +0100 tkr  r269806 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:15:26 +0100 tkr  r269754 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:09:04 +0100 tkr  r269753 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 15:57:05 +0100 tkr  r269752 : #i97003# Ask password container if persistent storage should be used
2009-03-19 15:53:18 +0100 tkr  r269751 : #i97003# ask if password container should use the persistent storage
2009-03-19 09:08:18 +0100 tkr  r269726 : #i99774# ucb: patch to silence warnings in gcc 4.4
2009-03-19 09:05:38 +0100 tkr  r269725 : #i99046# remove mime-type
2009-03-19 09:04:56 +0100 tkr  r269724 : #i97329# fixed truncated text on buttons
2009-03-19 09:03:50 +0100 tkr  r269723 : #i97542# Warning errors in uui / empty bodys in for loops

5 files changed, 9 insertions, 8 deletions

diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 21b85d51441e..bec0d36e0acb 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -119,7 +119,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
     {
         for( nNewLabelHeight = ( nTextWidth / nLableWidth + 1 ) * nTextHeight;
             nNewLabelHeight < aRect.GetHeight();
-            nNewLabelHeight += nTextHeight ) {}
+        nNewLabelHeight += nTextHeight ) {};
     }
 
     long nDelta = nNewLabelHeight - nLabelHeight;
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index a50d7017868c..a57255cddefe 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -101,7 +101,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr )
     long nNewLabelHeight = 0;
     for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
         nNewLabelHeight < aRect.GetHeight();
-        nNewLabelHeight += nTextHeight ) ;
+        nNewLabelHeight += nTextHeight ) {} ;
 
     long nDelta = nNewLabelHeight - nLabelHeight;
 
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 0893d3e2de9b..4a2c584cf123 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -92,7 +92,7 @@ PasswordDialog::PasswordDialog
     long nNewLabelHeight = 0;
     for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
         nNewLabelHeight < aRect.GetHeight();
-        nNewLabelHeight += nTextHeight ) ;
+        nNewLabelHeight += nTextHeight ) {} ;
 
     long nDelta = nNewLabelHeight - nLabelHeight;
 
diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc
index 827ed3e80b8a..e8e0f32fcbf0 100644
--- a/uui/source/sslwarndlg.hrc
+++ b/uui/source/sslwarndlg.hrc
@@ -43,7 +43,7 @@
 
 // Dims
 
-#define DLG_WIDTH              210
+#define DLG_WIDTH              240
 #define DLG_HEIGHT             125
 
 #define DLG_WARMIMG_HEIGHT      20
@@ -55,8 +55,9 @@
 
 #define DLG_CTLBTN_START_Y     DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT
 
-#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 5
-#define DLG_CTLBTN_CANCEL_START_X  DLG_WIDTH - 15 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
+#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 20
+#define DLG_CTLBTN_CANCEL_START_X  DLG_WIDTH - 45 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
 #define DLG_CTLBTN_OK_START_X      DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X
+#define DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 25
 #define DLG_CTLBTN_CERT_START_X    DLG_TEXT_START_X
 #endif //UUI_SSLWARN_HRC
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index d46784ad4b1e..51953968491d 100644
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.src
@@ -52,7 +52,7 @@ ModalDialog DLG_UUI_SSLWARN
     FixedText FT_LABEL_1
     {
         Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP );
-        Size = MAP_APPFONT( 165, DLG_TEXT_1_HEIGHT );
+        Size = MAP_APPFONT( 195, DLG_TEXT_1_HEIGHT );
 
         Text [ en-US ] = "No Text";
 
@@ -63,7 +63,7 @@ ModalDialog DLG_UUI_SSLWARN
     PushButton PB_VIEW__CERTIFICATE
     {
         Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+        Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
         Text [ en-US ] = "View Certificate";