ooo-build r14876 - in branches/ooo-build-3-0-1: . patches/dev300

[atimar svn gnome org]

Author: atimar
Date: Tue Dec 16 22:29:43 2008
New Revision: 14876
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14876&view=rev

Log:
2008-12-16  Andras Timar  <timar fsf hu>

	* patches/dev/apply: add i97329-sslwarndlg-truncation.diff for i#97329
	* patches/dev/i97329-sslwarndlg-truncation.diff: fix a truncation
 

Added:
   branches/ooo-build-3-0-1/patches/dev300/i97329-sslwarndlg-truncation.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Tue Dec 16 22:29:43 2008
@@ -495,6 +495,9 @@
 
 pythonloader-no-DEBUG.diff, i#90653
 
+# fix truncated text on sslwarndlg in uui module
+i97329-sslwarndlg-truncation.diff, i#97329, atimar
+
 [ Fixes < ooo300-m14 ]
 i95118.diff, i#93994, i#95118
 

Added: branches/ooo-build-3-0-1/patches/dev300/i97329-sslwarndlg-truncation.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/i97329-sslwarndlg-truncation.diff	Tue Dec 16 22:29:43 2008
@@ -0,0 +1,45 @@
+diff -Naur uui/source.org/sslwarndlg.hrc uui/source/sslwarndlg.hrc
+--- uui/source.org/sslwarndlg.hrc	2008-12-16 22:32:10.000000000 +0100
++++ uui/source/sslwarndlg.hrc	2008-12-16 22:49:15.000000000 +0100
+@@ -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 -Naur uui/source.org/sslwarndlg.src uui/source/sslwarndlg.src
+--- uui/source.org/sslwarndlg.src	2008-12-16 22:32:10.000000000 +0100
++++ uui/source/sslwarndlg.src	2008-12-16 22:44:46.000000000 +0100
+@@ -52,7 +52,7 @@
+     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 @@
+     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";
+