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

[atimar svn gnome org]

Author: atimar
Date: Fri Oct 31 23:13:50 2008
New Revision: 14453
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14453&view=rev

Log:


Added:
   trunk/patches/dev300/customunittext-percent.diff
   trunk/patches/dev300/customunittext-pixel.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 23:13:50 2008
@@ -532,6 +532,12 @@
 # fix the GNOME quickstarter to work again
 sfx2-shutdownicon-3layer.diff, bnc#434778, i#95223, pmladek
 
+# make CustomUnitText "Pixel" localisable
+customunittext-pixel.diff, i#61043, atimar
+
+# make CustomUnitText "%" consistent
+customunittext-percent.diff, i#80784, atimar
+
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek

Added: trunk/patches/dev300/customunittext-percent.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/customunittext-percent.diff	Fri Oct 31 23:13:50 2008
@@ -0,0 +1,174 @@
+--- svx/source/dialog/bmpmask.src.orig	2008-03-23 15:10:04.156250000 +0100
++++ svx/source/dialog/bmpmask.src	2008-03-23 15:15:00.765625000 +0100
+@@ -110,7 +110,7 @@
+ 		Last = 99 ;
+ 		SpinSize = 1 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	ListBox LB_1
+ 	{
+@@ -150,7 +150,7 @@
+ 		Last = 99 ;
+ 		SpinSize = 1 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	ListBox LB_2
+ 	{
+@@ -190,7 +190,7 @@
+ 		Last = 99 ;
+ 		SpinSize = 1 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	ListBox LB_3
+ 	{
+@@ -230,7 +230,7 @@
+ 		Last = 99 ;
+ 		SpinSize = 1 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	ListBox LB_4
+ 	{
+--- svx/source/dialog/grfflt.src.orig	2008-03-23 15:10:04.250000000 +0100
++++ svx/source/dialog/grfflt.src	2008-03-23 15:16:19.640625000 +0100
+@@ -186,7 +186,7 @@
+         Maximum = 100 ; 
+         StrictFormat = TRUE ; 
+         Unit = FUNIT_CUSTOM ; 
+-        CustomUnitText = " %" ;
++        CustomUnitText = "%" ;
+         Last = 100 ; 
+         SpinSize = 1 ; 
+     };
+@@ -265,7 +265,7 @@
+         Maximum = 100 ; 
+         StrictFormat = TRUE ; 
+         Unit = FUNIT_CUSTOM ; 
+-        CustomUnitText = " %" ;
++        CustomUnitText = "%" ;
+         First = 1 ; 
+         Last = 100 ; 
+         SpinSize = 1 ; 
+--- svx/source/dialog/tabline.src.orig	2008-03-23 15:10:04.359375000 +0100
++++ svx/source/dialog/tabline.src	2008-03-23 15:16:49.328125000 +0100
+@@ -482,7 +482,7 @@
+ 		DecimalDigits = 2 ;
+ 		Value = 1 ;
+ 		Unit = FUNIT_MM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 		SpinSize = 10 ;
+ 	};
+ 	MetricField MTR_FLD_LENGTH_2
+@@ -502,7 +502,7 @@
+ 		DecimalDigits = 2 ;
+ 		Value = 1 ;
+ 		Unit = FUNIT_MM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 		SpinSize = 10 ;
+ 	};
+ 	FixedText FT_DISTANCE
+@@ -525,7 +525,7 @@
+ 		DecimalDigits = 2 ;
+ 		Value = 1 ;
+ 		Unit = FUNIT_MM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 		Last = 5000 ;
+ 		SpinSize = 10 ;
+ 	};
+--- svx/source/engine3d/float3d.src.orig	2008-03-23 15:10:04.578125000 +0100
++++ svx/source/engine3d/float3d.src	2008-03-23 15:17:50.062500000 +0100
+@@ -250,7 +250,7 @@
+ 		Maximum = 100 ;
+ 		Last = 100 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	FixedText FT_BACKSCALE
+ 	{
+@@ -270,7 +270,7 @@
+ 		SpinSize = 5 ;
+ 		Maximum = 10000 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText  = " %" ;
++		CustomUnitText  = "%" ;
+ 		Last = 10000 ;
+ 	};
+ 	FixedText FT_END_ANGLE
+@@ -1113,7 +1113,7 @@
+ 		Repeat = TRUE ;
+ 		Spin = TRUE ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText  = " %" ;
++		CustomUnitText  = "%" ;
+ 		Minimum = 1 ;
+ 		First = 1 ;
+ 		Maximum = 100 ;
+--- svtools/source/dialogs/colrdlg.src.orig	2008-03-23 15:10:04.687500000 +0100
++++ svtools/source/dialogs/colrdlg.src	2008-03-23 15:18:14.531250000 +0100
+@@ -110,7 +110,7 @@
+ 		Maximum = 100 ;
+ 		Last = 100 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	MetricField NUM_MAGENTA
+ 	{
+@@ -123,7 +123,7 @@
+ 		Maximum = 100 ;
+ 		Last = 100 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	MetricField NUM_YELLOW
+ 	{
+@@ -136,7 +136,7 @@
+ 		Maximum = 100 ;
+ 		Last = 100 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+ 	MetricField NUM_KEY
+ 	{
+@@ -149,7 +149,7 @@
+ 		Maximum = 100 ;
+ 		Last = 100 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " %" ;
++		CustomUnitText = "%" ;
+ 	};
+     FixedText FT_RED
+ 	{
+--- chart2/source/controller/dialogs/tp_SeriesToAxis.src.orig	2008-03-23 14:54:20.578125000 +0100
++++ chart2/source/controller/dialogs/tp_SeriesToAxis.src	2008-03-23 14:57:58.031250000 +0100
+@@ -87,7 +87,7 @@
+ 		Maximum = 100 ;
+ 		StrictFormat = TRUE ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText  = " %" ;
++		CustomUnitText  = "%" ;
+ 		First = 1 ;
+ 		Last = 100 ;
+ 		SpinSize = 1 ;
+@@ -113,7 +113,7 @@
+ 		Maximum = 600 ;
+ 		StrictFormat = TRUE ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText  = " %" ;
++		CustomUnitText  = "%" ;
+ 		First = 1 ;
+ 		Last = 100 ;
+ 		SpinSize = 1 ;

Added: trunk/patches/dev300/customunittext-pixel.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/customunittext-pixel.diff	Fri Oct 31 23:13:50 2008
@@ -0,0 +1,51 @@
+--- sd/source/ui/dlg/vectdlg.src.orig	2008-03-23 15:10:03.984375000 +0100
++++ sd/source/ui/dlg/vectdlg.src	2008-03-23 15:19:09.062500000 +0100
+@@ -136,7 +136,7 @@
+ 		Last = 32 ;
+ 		SpinSize = 1 ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " Pixel" ;
++		CustomUnitText [ en-US ] = " Pixel" ;
+ 	};
+ 
+ 	CheckBox CB_FILLHOLES
+@@ -169,7 +169,7 @@
+ 		Last = 128;
+ 		SpinSize = 1;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " Pixel" ;
++		CustomUnitText [ en-US ] = " Pixel" ;
+ 	};
+ 
+ 	FixedText FT_ORIGINAL
+--- svx/source/dialog/grfflt.src.orig	2008-03-23 15:10:04.250000000 +0100
++++ svx/source/dialog/grfflt.src	2008-03-23 15:16:19.640625000 +0100
+@@ -83,7 +83,7 @@
+         Maximum = 999 ;
+         StrictFormat = TRUE ;
+         Unit = FUNIT_CUSTOM ;
+-        CustomUnitText = " Pixel" ;
++        CustomUnitText [ en-US ] = " Pixel" ;
+         First = 1 ;
+         Last = 999 ;
+         SpinSize = 1 ;
+@@ -108,7 +108,7 @@
+         Maximum = 999 ;
+         StrictFormat = TRUE ;
+         Unit = FUNIT_CUSTOM ;
+-        CustomUnitText = " Pixel" ;
++        CustomUnitText [ en-US ] = " Pixel" ;
+         First = 1 ;
+         Last = 999 ;
+         SpinSize = 1 ;
+--- svx/source/dialog/textanim.src.orig	2008-03-23 15:10:04.484375000 +0100
++++ svx/source/dialog/textanim.src	2008-03-23 15:17:16.406250000 +0100
+@@ -232,7 +232,7 @@
+ 		Spin = TRUE ;
+ 		StrictFormat = TRUE ;
+ 		Unit = FUNIT_CUSTOM ;
+-		CustomUnitText = " Pixel" ;
++		CustomUnitText [ en-US ] = " Pixel" ;
+ 		Minimum = 1 ;
+ 		First = 1 ;
+ 		Maximum = 10000 ;