ooo-build r12124 - in trunk: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Mon Apr  7 23:27:46 2008
New Revision: 12124
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12124&view=rev

Log:
2008-04-07  Chris Cheney <ccheney ubuntu com>

        * patches/src680/apply,
          patches/src680/ooo85931.inconsistent.getentrypos.diff: Add patch to
          correct inconsistent GetEntryPos return value.



Added:
   trunk/patches/src680/ooo85931.inconsistent.getentrypos.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Apr  7 23:27:46 2008
@@ -1748,6 +1748,7 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
+ooo85931.inconsistent.getentrypos.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff

Added: trunk/patches/src680/ooo85931.inconsistent.getentrypos.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ooo85931.inconsistent.getentrypos.diff	Mon Apr  7 23:27:46 2008
@@ -0,0 +1,11 @@
+--- svx/source/dialog/multipat.cxx	27 Jun 2007 17:22:03 -0000	1.11
++++ 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;