rpms/openoffice.org/devel workspace.unifypaper01.patch,1.2,1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15647

Modified Files:
	workspace.unifypaper01.patch 
Log Message:
fix patch

workspace.unifypaper01.patch:

Index: workspace.unifypaper01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifypaper01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.unifypaper01.patch	10 Jun 2009 10:51:31 -0000	1.2
+++ workspace.unifypaper01.patch	11 Jun 2009 14:26:50 -0000	1.3
@@ -11011,7 +11011,7 @@ diff -ru --exclude='unxlng*.pro' --exclu
  }
 diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/svx/source/dialog/page.h OOO310_m12/svx/source/dialog/page.h
 --- OOO310_m12.orig/svx/source/dialog/page.h	2009-05-27 14:28:32.000000000 +0100
-+++ OOO310_m12/svx/source/dialog/page.h	2009-05-28 09:14:12.000000000 +0100
++++ OOO310_m12/svx/source/dialog/page.h	2009-05-28 09:09:42.000000000 +0100
 @@ -38,13 +38,13 @@
  #define PAPERSIZE_A3			3
  #define PAPERSIZE_A4			4
@@ -11029,7 +11029,7 @@ diff -ru --exclude='unxlng*.pro' --exclu
  #define PAPERSIZE_C4			13
  #define PAPERSIZE_C5			14
  #define PAPERSIZE_C6			15
-@@ -52,24 +52,22 @@
+@@ -52,25 +52,23 @@
  #define PAPERSIZE_DL			17
  #define PAPERSIZE_DIA   		18
  #define PAPERSIZE_SCREEN		19
@@ -11052,25 +11052,26 @@ diff -ru --exclude='unxlng*.pro' --exclu
 -#define PAPERSIZE_B4_JIS		36
 -#define PAPERSIZE_B5_JIS		37
 -#define PAPERSIZE_B6_JIS		38
-+#define PAPERSIZE_C 			20
-+#define PAPERSIZE_D 			21
-+#define PAPERSIZE_E 			22
-+#define PAPERSIZE_EXECUTIVE 	23
-+#define PAPERSIZE_LEGAL2		24
-+#define PAPERSIZE_MONARCH   	25
-+#define PAPERSIZE_COM675  		26
-+#define PAPERSIZE_COM9  		27
-+#define PAPERSIZE_COM10 		28
-+#define PAPERSIZE_COM11 		29
-+#define PAPERSIZE_COM12 		30
-+#define PAPERSIZE_KAI16 		31
-+#define PAPERSIZE_KAI32 		32
-+#define PAPERSIZE_KAI32BIG 		33
-+#define PAPERSIZE_B4_JIS		34
-+#define PAPERSIZE_B5_JIS		35
-+#define PAPERSIZE_B6_JIS		36
++#define PAPERSIZE_C             20
++#define PAPERSIZE_D             21
++#define PAPERSIZE_E             22
++#define PAPERSIZE_EXECUTIVE		23
++#define PAPERSIZE_LEGAL2        24
++#define PAPERSIZE_MONARCH     	25
++#define PAPERSIZE_COM675        26
++#define PAPERSIZE_COM9          27
++#define PAPERSIZE_COM10         28
++#define PAPERSIZE_COM11         29
++#define PAPERSIZE_COM12         30
++#define PAPERSIZE_KAI16         31
++#define PAPERSIZE_KAI32         32
++#define PAPERSIZE_KAI32BIG      33
++#define PAPERSIZE_B4_JIS        34
++#define PAPERSIZE_B5_JIS        35
++#define PAPERSIZE_B6_JIS        36
  
  #endif
+ 
 diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/svx/source/dialog/page.hxx OOO310_m12/svx/source/dialog/page.hxx
 --- OOO310_m12.orig/svx/source/dialog/page.hxx	2009-05-27 14:28:32.000000000 +0100
 +++ OOO310_m12/svx/source/dialog/page.hxx	2009-05-28 09:09:42.000000000 +0100