[ooo-build-commit] patches/dev300 patches/vba

[Tor Lillqvist]

 patches/dev300/apply                 |    2 --
 patches/vba/stringnumbercompare.diff |   34 ----------------------------------
 2 files changed, 36 deletions(-)

New commits:
commit 6d29b58f205c3e41b3f955ff27e41add2831b09b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 11:58:34 2009 +0300

    stringnumbercompare.diff is upstream in dev300-m56
    
    * patches/vba/stringnumbercompare.diff: Delete. Is in dev300-m56.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b009e88..55799d1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1583,8 +1583,6 @@ vba-basic-macrochoose-dialog.diff, Fong
 vba-fix-basic-macro-organizer.diff, n#439972, Fong
 # fix bug accessing default member of userform control
 range-listBox-compare.diff, n#421939
-# fix bug comparing string that can't be converted to number
-stringnumbercompare.diff, n#422559
 
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak.diff
diff --git a/patches/vba/stringnumbercompare.diff b/patches/vba/stringnumbercompare.diff
deleted file mode 100644
index 5b05478..0000000
--- a/patches/vba/stringnumbercompare.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvalue.cxx
-index fb57038..dd5f9c1 100644
---- basic/source/sbx/sbxvalue.cxx
-+++ basic/source/sbx/sbxvalue.cxx
-@@ -1572,7 +1572,9 @@ BOOL SbxValue::Compare( SbxOperator eOp,
- 		else
- 		{
- 			aL.eType = aR.eType = SbxDOUBLE;
--			if( Get( aL ) && rOp.Get( aR ) )
-+			bool bGetL = Get( aL );
-+			bool bGetR =  rOp.Get( aR );
-+			if( bGetL && bGetR )
- 			  switch( eOp )
- 			{
- 				case SbxEQ:
-@@ -1590,6 +1592,18 @@ BOOL SbxValue::Compare( SbxOperator eOp,
- 				default:
- 					SetError( SbxERR_NOTIMP );
- 			}
-+			// at least one value was got
-+			// if this is VBA then a conversion error for one
-+			// side will yield a false result of an equality test
-+			else if ( bGetR || bGetL )
-+			{
-+				if ( bVBAInterop && eOp == SbxEQ  && GetError() == SbxERR_CONVERSION )
-+				{
-+					ResetError();
-+					bRes = FALSE;
-+				}
-+			}
-+
- 		}
- 	}
- 	if( eOld != SbxERR_OK )