GNOME.org
 

ooo-build r15263 - in trunk: . patches/dev300

Author: atimar
Date: Sat Jan 31 16:36:38 2009
New Revision: 15263
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15263&view=rev

Log:
2009-01-31  Andras Timar  <timar fsf hu>

	* patches/dev300/apply: add padmin-dialog-resize.diff, sw-dialogs-resize.diff,
	  svx-dialogs-resize.diff for i#98164
	* patches/dev300/padmin-dialog-resize.diff: fix a truncation
	* patches/dev300/sw-dialogs-resize.diff: fix truncations
	* patches/dev300/svx-dialogs-resize.diff: fix truncations
	* patches/dev300/apply: add i97329-sslwarndlg-truncation.diff for i#97329
	* patches/dev300/i97329-sslwarndlg-truncation.diff: fix a truncation
	(All above were ported from ooo-build-3-0-1, because they haven't been fixed for 3.1)



Added:
   trunk/patches/dev300/i97329-sslwarndlg-truncation.diff
   trunk/patches/dev300/padmin-dialog-resize.diff
   trunk/patches/dev300/svx-dialogs-resize.diff
   trunk/patches/dev300/sw-dialogs-resize.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Jan 31 16:36:38 2009
@@ -618,6 +618,16 @@
 # the second causes problems with IBM Java 1.6.0
 jvmfwk-libjvm-path-ibm-java-1.6.0.diff, n#440459, i#95838, pmladek
 
+# fix truncated localized text on sslwarndlg in uui module
+i97329-sslwarndlg-truncation.diff, i#97329, atimar
+
+# fix truncated localized text on several dialogs 
+# see http://wiki.services.openoffice.org/wiki/Hu.openoffice.org/QA_Screenshots
+padmin-dialog-resize.diff, i#98164, atimar
+sw-dialogs-resize.diff, i#98164, atimar
+svx-dialogs-resize.diff, i#98164, atimar
+
+
 [ Fixes < dev300-m38 ]
 i95118.diff, i#93994, i#95118
 

Added: trunk/patches/dev300/i97329-sslwarndlg-truncation.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/i97329-sslwarndlg-truncation.diff	Sat Jan 31 16:36:38 2009
@@ -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";
+ 

Added: trunk/patches/dev300/padmin-dialog-resize.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/padmin-dialog-resize.diff	Sat Jan 31 16:36:38 2009
@@ -0,0 +1,27 @@
+--- padmin/source/rtsetup.src.orig2	2009-01-16 23:05:30.000000000 +0100
++++ padmin/source/rtsetup.src	2009-01-16 23:19:59.000000000 +0100
+@@ -306,12 +306,13 @@
+     CheckBox RID_RTS_CMD_CB_EXTERNAL
+     {
+         Pos = MAP_APPFONT( 11, 95 );
+-        Size = MAP_APPFONT( 220, 10 );
++        Size = MAP_APPFONT( 220, 24 );
++        WordBreak = TRUE;
+         Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog";
+     };
+     FixedText RID_RTS_CMD_FT_QUICKCMD
+     {
+-        Pos = MAP_APPFONT( 11, 110 );
++        Pos = MAP_APPFONT( 11, 124 );
+         Size = MAP_APPFONT( 150, 20 );
+         WordBreak = TRUE;
+         Text [ en-US ] = "Command for quick printing without dialog (optional)";
+@@ -321,7 +322,7 @@
+         Border = TRUE;
+         Sort = TRUE;
+         Dropdown = TRUE;
+-        Pos = MAP_APPFONT( 11, 130 );
++        Pos = MAP_APPFONT( 11, 144 );
+         Size = MAP_APPFONT( 150, 65 );
+     };
+     FixedLine RID_RTS_CMD_FL_INSTALL

Added: trunk/patches/dev300/svx-dialogs-resize.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/svx-dialogs-resize.diff	Sat Jan 31 16:36:38 2009
@@ -0,0 +1,105 @@
+--- svx/source/dialog/svuidlg.src.orig	2009-01-16 21:07:26.000000000 +0100
++++ svx/source/dialog/svuidlg.src	2009-01-16 23:47:44.000000000 +0100
+@@ -156,37 +156,37 @@
+ 	};
+ 	CancelButton 1
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 6 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 6 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 		Text [ en-US ] = "~Close" ;
+ 	};
+ 	HelpButton 1
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 26 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 26 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 	};
+ 	PushButton PB_UPDATE_NOW
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 43 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 43 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 		Text [ en-US ] = "~Update" ;
+ 	};
+ 	PushButton PB_OPEN_SOURCE
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 60 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 60 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 		Text [ en-US ] = "~Open" ;
+ 	};
+ 	PushButton PB_CHANGE_SOURCE
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 77 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 77 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 		Text [ en-US ] = "~Modify..." ;
+ 	};
+ 	PushButton PB_BREAK_LINK
+ 	{
+-		Pos = MAP_APPFONT ( 275 , 94 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Pos = MAP_APPFONT ( 270 , 94 ) ;
++		Size = MAP_APPFONT ( 60 , 14 ) ;
+ 		Text [ en-US ] = "~Break Link" ;
+ 	};
+ 	FixedText FT_FILES2
+--- svx/inc/optgenrl.hrc.orig	2009-01-16 20:33:08.000000000 +0100
++++ svx/inc/optgenrl.hrc	2009-01-16 20:33:24.000000000 +0100
+@@ -74,7 +74,7 @@
+ #define LINEH		12
+ #define FLINEH		8
+ #define	LEFT		12
+-#define MID         96
++#define MID         100
+ #define RIGHT		248
+ #define TOP			10
+ #define LINE(y)		(14+y*15)
+--- svx/source/dialog/zoom.src.orig	2009-01-16 21:32:37.000000000 +0100
++++ svx/source/dialog/zoom.src	2009-01-16 23:53:36.000000000 +0100
+@@ -55,7 +55,7 @@
+     RadioButton BTN_WHOLE_PAGE
+ 	{
+         Pos = MAP_APPFONT ( 12 , 27 ) ;
+-        Size = MAP_APPFONT ( 91 , 10 ) ;
++        Size = MAP_APPFONT ( 104 , 10 ) ;
+         Text [ en-US ] = "~Fit width and height" ;
+ 	};
+ 	RadioButton BTN_PAGE_WIDTH
+--- svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src.orig	2009-01-16 22:12:48.000000000 +0100
++++ svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src	2009-01-16 22:16:07.000000000 +0100
+@@ -39,7 +39,7 @@
+ 
+ #define FULL_WIDTH (220)
+ #define FULL_HEIGHT (120)
+-#define EDITBUTTON_WIDTH (70)
++#define EDITBUTTON_WIDTH (75)
+ 
+ #define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
+ #define COL_2 (COL_1+RSC_SP_FLGR_SPACE_X)
+--- svx/source/dialog/hangulhanjadlg.src.orig	2009-01-16 22:41:29.000000000 +0100
++++ svx/source/dialog/hangulhanjadlg.src	2009-01-16 22:43:22.000000000 +0100
+@@ -81,7 +81,7 @@
+ 	RadioButton RB_HANJA_HANGUL_BRACKETED
+ 	{
+ 		Pos = MAP_APPFONT( 109, 81 );
+-		Size = MAP_APPFONT( 55, 8 );
++		Size = MAP_APPFONT( 56, 8 );
+ 
+ 		Text [ en-US ] = "Hanja (Han~gul)";
+ 	};
+@@ -89,7 +89,7 @@
+ 	RadioButton RB_HANGUL_HANJA_BRACKETED
+ 	{
+ 		Pos = MAP_APPFONT( 167, 81 );
+-		Size = MAP_APPFONT( 55, 8 );
++		Size = MAP_APPFONT( 56, 8 );
+ 
+ 		Text [ en-US ] = "Hang~ul (Hanja)";
+ 	};

Added: trunk/patches/dev300/sw-dialogs-resize.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-dialogs-resize.diff	Sat Jan 31 16:36:38 2009
@@ -0,0 +1,99 @@
+--- sw/source/ui/table/convert.src.orig	2009-01-16 22:22:15.000000000 +0100
++++ sw/source/ui/table/convert.src	2009-01-16 22:27:09.000000000 +0100
+@@ -36,7 +36,7 @@
+ {
+ 	HelpID = FN_CONVERT_TEXT_TABLE ;
+ 	OUTPUTSIZE = TRUE ;
+-    Size = MAP_APPFONT ( 203 , 152 ) ;
++    Size = MAP_APPFONT ( 223 , 152 ) ;
+ 	Text [ en-US ] = "Convert Table to Text" ;
+ 	MOVEABLE = TRUE ;
+ 	SVLOOK = TRUE ;
+@@ -158,26 +158,26 @@
+ 	OkButton BT_OK
+ 	{
+         Pos = MAP_APPFONT ( 147 , 6 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Size = MAP_APPFONT ( 70 , 14 ) ;
+ 		TABSTOP = TRUE ;
+ 		DefButton = TRUE ;
+ 	};
+ 	CancelButton BT_CANCEL
+ 	{
+         Pos = MAP_APPFONT ( 147 , 23 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Size = MAP_APPFONT ( 70 , 14 ) ;
+ 		TABSTOP = TRUE ;
+ 	};
+ 	HelpButton BT_HELP
+ 	{
+         Pos = MAP_APPFONT ( 147 , 43 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Size = MAP_APPFONT ( 70 , 14 ) ;
+ 		TABSTOP = TRUE ;
+ 	};
+ 	PushButton BT_AUTOFORMAT
+ 	{
+         Pos = MAP_APPFONT ( 147 , 60 ) ;
+-		Size = MAP_APPFONT ( 50 , 14 ) ;
++		Size = MAP_APPFONT ( 70 , 14 ) ;
+ 		TabStop = TRUE ;
+ 		Hide = TRUE ;
+ 		Text [ en-US ] = "Auto~Format..." ;
+--- sw/source/ui/table/colwd.src.orig	2009-01-16 22:32:29.000000000 +0100
++++ sw/source/ui/table/colwd.src	2009-01-16 22:37:01.000000000 +0100
+@@ -63,14 +63,14 @@
+ 	FixedText FT_WIDTH
+ 	{
+ 		Pos = MAP_APPFONT ( 12 , 31 ) ;
+-		Size = MAP_APPFONT ( 22 , 8 ) ;
++		Size = MAP_APPFONT ( 28 , 8 ) ;
+ 		Text [ en-US ] = "~Width" ;
+ 		Left = TRUE ;
+ 	};
+ 	MetricField ED_WIDTH
+ 	{
+ 		Border = TRUE ;
+-		Pos = MAP_APPFONT ( 41 , 30 ) ;
++		Pos = MAP_APPFONT ( 44 , 30 ) ;
+ 		Size = MAP_APPFONT ( 38 , 12 ) ;
+ 		TabStop = TRUE ;
+ 		Left = TRUE ;
+@@ -101,7 +101,7 @@
+ 	NumericField ED_COL
+ 	{
+ 		Border = TRUE ;
+-		Pos = MAP_APPFONT ( 41 , 14 ) ;
++		Pos = MAP_APPFONT ( 44 , 14 ) ;
+ 		Size = MAP_APPFONT ( 38 , 12 ) ;
+ 		TabStop = TRUE ;
+ 		Left = TRUE ;
+--- sw/source/ui/config/optdlg.src.orig	2009-01-16 22:57:46.000000000 +0100
++++ sw/source/ui/config/optdlg.src	2009-01-16 22:59:53.000000000 +0100
+@@ -60,7 +60,7 @@
+     CheckBox CB_CROSS
+ 	{
+         Pos = MAP_APPFONT ( 12 , 14 ) ;
+-		Size = MAP_APPFONT ( 108 , 10 ) ;
++		Size = MAP_APPFONT ( 116 , 10 ) ;
+     	Text [ en-US ] = "Guides ~while moving";
+ 	};
+ 	CheckBox CB_HANDLE
+@@ -103,7 +103,7 @@
+     CheckBox CB_HRULER
+ 	{
+         Pos = MAP_APPFONT ( 142 , 53 ) ;
+-        Size = MAP_APPFONT ( 61 , 10 ) ;
++        Size = MAP_APPFONT ( 62 , 10 ) ;
+ 		Text [ en-US ] = "Hori~zontal ruler" ;
+ 	};
+     ListBox LB_HMETRIC
+@@ -115,7 +115,7 @@
+     CheckBox CB_VRULER
+ 	{
+         Pos = MAP_APPFONT ( 142 , 66 ) ;
+-        Size = MAP_APPFONT ( 61 , 10 ) ;
++        Size = MAP_APPFONT ( 62 , 10 ) ;
+ 		Text [ en-US ] = "Verti~cal ruler" ;
+ 	};
+     CheckBox CB_VRULER_RIGHT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]