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

[Pei Feng Lin]

 patches/dev300/apply               |    1 +
 patches/vba/vba-basic-not-fix.diff |   17 +++++++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit bcb6a91987ecbaf1d0052b3de4abe8d3750a5a9a
Author: Fong Lin <pflin at novell.com>
Date:   Fri Sep 25 10:33:04 2009 +0800

    Fixed for i#105321, "Do While Not "foo"="" " causes date type mismatch.
    
    * patches/dev300/apply:
    * patches/vba/vba-basic-not-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d0a8cc5..b4d2e46 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1621,6 +1621,7 @@ SectionOwner => noelpwer
 
 cws-vbasupportdev300.diff
 vba-reenable-rowsourcefixes.diff, bnc#540960
+vba-basic-not-fix.diff, i#105321, Fong
 
 [VBAUntested]
 SectionOwner => noelpwer
diff --git a/patches/vba/vba-basic-not-fix.diff b/patches/vba/vba-basic-not-fix.diff
new file mode 100644
index 0000000..6b67ce9
--- /dev/null
+++ b/patches/vba/vba-basic-not-fix.diff
@@ -0,0 +1,17 @@
+diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx
+index 1c9ad8f..e12496c 100644
+--- basic/source/comp/exprtree.cxx
++++ basic/source/comp/exprtree.cxx
+@@ -574,7 +574,11 @@ SbiExprNode* SbiExpression::Unary()
+             eTok = NEG;
+         case NOT:
+             pParser->Next();
+-            pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
++            // process something like "Do While Not "foo"="" "
++            if( pParser->IsVBASupportOn() )
++                pNd = new SbiExprNode( pParser, Like(), eTok, NULL );
++            else    
++                pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+             break;
+         case PLUS:
+             pParser->Next();