rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch, NONE, 1.1 .cvsignore, 1.101, 1.102 openoffice.org.spec, 1.673, 1.674 sources, 1.167, 1.168

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12538

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch 
Log Message:
lets go, hay ho

openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch:
 source/gdi/sallayout.cxx     |    0 
 vcl/source/gdi/sallayout.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch ---
Index: source/gdi/sallayout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v
retrieving revision 1.75
diff -u -r1.75 sallayout.cxx
--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	26 Jan 2006 18:09:48 -0000	1.75
+++ openoffice.org/vcl/source/gdi/sallayout.cxx	25 Apr 2006 11:42:27 -0000
@@ -1560,7 +1560,7 @@
     for( n = 0; n < nLevel; ++n )
         maFallbackRuns[n].ResetPos();
     int nActiveCharPos = nCharPos[0];
-    while( nValid[0] && (nLevel > 1))
+    while( nValid[0] && (nLevel > 0))
     {
         // find best fallback level
         for( n = 0; n < nLevel; ++n )


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	22 Mar 2006 11:53:38 -0000	1.101
+++ .cvsignore	25 Apr 2006 15:43:00 -0000	1.102
@@ -162,3 +162,4 @@
 OOB680_m4.tar.bz2
 OOB680_m5.tar.bz2
 openoffice.org-dict-cs_CZ.tar.gz
+ooo64726.sdf


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -r1.673 -r1.674
--- openoffice.org.spec	24 Apr 2006 12:24:18 -0000	1.673
+++ openoffice.org.spec	25 Apr 2006 15:43:00 -0000	1.674
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -140,6 +140,7 @@
 Source12:       apache-ant-1.6.5-bin.tar.bz2
 Source13:       Archive-Zip-1.13.tar.gz
 %endif
+Source14:       ooo64726.sdf
 %if ! %{build_rhel4}
 BuildRequires:  ant, perl-Archive-Zip
 %endif
@@ -230,6 +231,7 @@
 Patch40: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch41: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch42: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch43: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1152,6 +1154,7 @@
 %patch40 -p1 -b .rh188467.printingdefaults.patch
 %patch41 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch43 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1251,6 +1254,7 @@
 deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
+localize -m -x -l bn -f %{SOURCE14}
 cd ../..
 
 cd instsetoo_native/util
@@ -3706,6 +3710,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
+- ooo#64743# continuing my epic battle with CJK and Indic glyph
+  fallback (rh#189760#)
+- ooo#64726# "untranslate" bengali keyboard shortcuts (rh#189760#)
+
 * Mon Apr 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.11
 - ooo#64063# Finally 2.0.X Tamil translation updates
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- sources	24 Apr 2006 08:13:18 -0000	1.167
+++ sources	25 Apr 2006 15:43:00 -0000	1.168
@@ -10,3 +10,4 @@
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
 008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf
 7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf
+05a906513ef89af5e189097fa0c50681  ooo64726.sdf