rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch, NONE, 1.1 openoffice.org.spec, 1.1346, 1.1347

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv655

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch 
Log Message:
Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch

openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch ---
Index: source/dialog/multipat.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/multipat.cxx,v
retrieving revision 1.11
diff -u -r1.11 multipat.cxx
--- openoffice.org.orig/svx/source/dialog/multipat.cxx	27 Jun 2007 17:22:03 -0000	1.11
+++ openoffice.org/svx/source/dialog/multipat.cxx	7 Feb 2008 08:54:15 -0000
@@ -138,7 +138,7 @@
         if ( pImpl->bIsRadioButtonMode )
         {
             ULONG nPos = aRadioLB.GetEntryPos( sInsPath, 1 );
-            if ( (ULONG)-1 == nPos )
+            if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos
             {
                 String sNewEntry( '\t' );
                 sNewEntry += sInsPath;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -r1.1346 -r1.1347
--- openoffice.org.spec	6 Feb 2008 08:58:50 -0000	1.1346
+++ openoffice.org.spec	7 Feb 2008 09:02:34 -0000	1.1347
@@ -165,6 +165,7 @@
 Patch83: workspace.sw8u9bf01.patch
 Patch84: workspace.sw24bf02.patch
 Patch85: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
+Patch86: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1125,6 +1126,7 @@
 %patch83 -p1 -b .workspace.sw8u9bf01.patch
 %patch84 -p1 -b .workspace.sw24bf02.patch
 %patch85 -p1 -b .ooo85321.vcl.pixmapleak.patch
+%patch86 -p1 -b .ooo85931.svx.getentrypos.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2837,6 +2839,7 @@
 - remove pixmap leak openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 - Resolves: rhbz#429897 one click print with lpr-only backend fix
 - Resolves: rhbz#431606 require jre not java
+- Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 
 * Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch