rpms/openoffice.org/devel openoffice.org-3.3.0.ooo111758.sd.xerror.patch, 1.1, 1.2 openoffice.org.spec, 1.2239, 1.2240 workspace.locales33a.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15804

Modified Files:
	openoffice.org-3.3.0.ooo111758.sd.xerror.patch 
	openoffice.org.spec workspace.locales33a.patch 
Log Message:
fix workspace.locales33a.patch

openoffice.org-3.3.0.ooo111758.sd.xerror.patch:
 slideshow.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo111758.sd.xerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.3.0.ooo111758.sd.xerror.patch	21 May 2010 15:21:31 -0000	1.1
+++ openoffice.org-3.3.0.ooo111758.sd.xerror.patch	14 Jun 2010 08:57:50 -0000	1.2
@@ -1,7 +1,7 @@
 diff -ru sd.orig/source/ui/slideshow/slideshow.cxx sd/source/ui/slideshow/slideshow.cxx
 --- sd.orig/source/ui/slideshow/slideshow.cxx	2010-05-21 15:44:15.000000000 +0100
 +++ sd/source/ui/slideshow/slideshow.cxx	2010-05-21 15:45:57.000000000 +0100
-@@ -702,6 +702,8 @@
+@@ -699,6 +699,8 @@
  		ViewShellBase* pFullScreenViewShellBase = mpFullScreenViewShellBase;
  		mpFullScreenViewShellBase = 0;
  
@@ -10,7 +10,7 @@ diff -ru sd.orig/source/ui/slideshow/sli
  		if( pFullScreenViewShellBase )
  		{
  			PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get());
-@@ -716,8 +718,6 @@
+@@ -713,8 +715,6 @@
  			}
  		}
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2239
retrieving revision 1.2240
diff -u -p -r1.2239 -r1.2240
--- openoffice.org.spec	14 Jun 2010 08:07:01 -0000	1.2239
+++ openoffice.org.spec	14 Jun 2010 08:57:50 -0000	1.2240
@@ -1696,7 +1696,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch65 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
 %patch66 -p0 -b .workspace.chart47.patch
 %patch67 -p0 -b .ooo111699.svx.nullfield.patch
-%patch66 -p0 -b .ooo111758.sd.xerror.patch
+%patch68 -p0 -b .ooo111758.sd.xerror.patch
 %patch69 -p1 -b .workspace.extras330.patch
 %patch70 -p1 -b .ooo111741.extras.malformed-xml-file.patch
 %patch71 -p0 -b .ooo111886.sw.layout.workaround.patch

workspace.locales33a.patch:
 b/i18npool/source/localedata/data/mai_IN.xml          |  357 ++++++++++++++++++
 i18npool/source/breakiterator/data/char_in.txt        |  112 ++++-
 i18npool/source/localedata/data/localedata_others.map |   17 
 i18npool/source/localedata/data/makefile.mk           |    2 
 i18npool/source/localedata/localedata.cxx             |    1 
 5 files changed, 463 insertions(+), 26 deletions(-)

Index: workspace.locales33a.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.locales33a.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.locales33a.patch	11 Jun 2010 07:45:16 -0000	1.2
+++ workspace.locales33a.patch	14 Jun 2010 08:57:50 -0000	1.3
@@ -509,34 +509,33 @@ diff -r 345841e986e1 -r 19e0e06e8f27 i18
 diff -r 345841e986e1 -r 19e0e06e8f27 i18npool/source/localedata/data/makefile.mk
 --- a/i18npool/source/localedata/data/makefile.mk	Fri Jun 11 00:38:55 2010 +0200
 +++ b/i18npool/source/localedata/data/makefile.mk	Fri Jun 11 01:09:07 2010 +0200
-@@ -176,6 +176,7 @@
+@@ -173,6 +173,7 @@
+     $(MISC)$/localedata_ln_CD.cxx  \
+     $(MISC)$/localedata_lo_LA.cxx  \
      $(MISC)$/localedata_lt_LT.cxx  \
-     $(MISC)$/localedata_ltg_LV.cxx  \
++    $(MISC)$/localedata_mai_IN.cxx  \
      $(MISC)$/localedata_lv_LV.cxx  \
-+    $(MISC)$/localedata_mai_IN.cxx \
      $(MISC)$/localedata_mk_MK.cxx  \
      $(MISC)$/localedata_ml_IN.cxx  \
-     $(MISC)$/localedata_mn_MN.cxx  \
-@@ -451,6 +452,7 @@
- 	$(SLO)$/localedata_lg_UG.obj \
- 	$(SLO)$/localedata_ln_CD.obj \
- 	$(SLO)$/localedata_lo_LA.obj \
-+	$(SLO)$/localedata_mai_IN.obj \
- 	$(SLO)$/localedata_ml_IN.obj \
- 	$(SLO)$/localedata_mn_MN.obj \
- 	$(SLO)$/localedata_mr_IN.obj \
+@@ -362,6 +363,7 @@
+ 	$(SLO)$/localedata_lb_LU.obj	\
+ 	$(SLO)$/localedata_lt_LT.obj	\
+ 	$(SLO)$/localedata_lv_LV.obj	\
++	$(SLO)$/localedata_mai_IN.obj	\
+ 	$(SLO)$/localedata_mk_MK.obj	\
+ 	$(SLO)$/localedata_mt_MT.obj	\
+ 	$(SLO)$/localedata_nb_NO.obj	\
 diff -r 345841e986e1 -r 19e0e06e8f27 i18npool/source/localedata/localedata.cxx
 --- a/i18npool/source/localedata/localedata.cxx	Fri Jun 11 00:38:55 2010 +0200
 +++ b/i18npool/source/localedata/localedata.cxx	Fri Jun 11 01:09:07 2010 +0200
-@@ -249,6 +249,7 @@
+@@ -252,6 +252,7 @@
+     { "ar_OM",  lcl_DATA_OTHERS },
      { "ug_CN",  lcl_DATA_OTHERS },
      { "om_ET",  lcl_DATA_OTHERS },
-     { "plt_MG", lcl_DATA_OTHERS },
-+    { "mai_IN", lcl_DATA_OTHERS },
++    { "mai_IN", lcl_DATA_OTHERS }
  };
  
  static const sal_Unicode under = sal_Unicode('_');
-
 diff -r 03068afc23c6 i18npool/source/breakiterator/data/char_in.txt
 --- a/i18npool/source/breakiterator/data/char_in.txt	Sun Apr 25 15:43:24 2010 +0100
 +++ b/i18npool/source/breakiterator/data/char_in.txt	Mon Apr 26 10:21:41 2010 +0100