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

[Noel Power]

 patches/dev300/apply                              |    2 +-
 patches/vba/vba-fix-logical-precedence-order.diff |   14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit ee6282e399327902c75c5bc2c8a1ad01b8901f78
Author: Noel Power <noel.power at novell.com>
Date:   Wed Oct 6 16:31:02 2010 +0100

    re-enable vba-fix-logical-precedence-order.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bfa9db7..1277dc1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1117,7 +1117,7 @@ vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#1
 vba-rangecell-colparam.diff, bnc#639297
 # fix logical Operator precendence for VBA
 # disabled as it causes a regression
-#vba-fix-logical-precedence-order.diff
+vba-fix-logical-precedence-order.diff, bnc#644156
 # fix bug with implicit handling of XIndexAccess for
 # objects ( introduced in vbasupportdev300.diff )
 vba-fix-implicit-indexaccess.diff
diff --git a/patches/vba/vba-fix-logical-precedence-order.diff b/patches/vba/vba-fix-logical-precedence-order.diff
index 0905a07..f486a0d 100644
--- a/patches/vba/vba-fix-logical-precedence-order.diff
+++ b/patches/vba/vba-fix-logical-precedence-order.diff
@@ -1,13 +1,17 @@
 diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx
-index e7025f7..38098f1 100644
+index e7025f7..dc3ec80 100644
 --- basic/source/comp/exprtree.cxx
 +++ basic/source/comp/exprtree.cxx
-@@ -583,12 +583,15 @@ SbiExprNode* SbiExpression::Unary()
+@@ -582,13 +582,19 @@ SbiExprNode* SbiExpression::Unary()
+     {
          case MINUS:
              eTok = NEG;
-         case NOT:
--            pParser->Next();
+-        case NOT:
+             pParser->Next();
 -            // process something like "Do While Not "foo"="" "
++            pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
++            break;
++        case NOT:
              if( pParser->IsVBASupportOn() )
 -                pNd = new SbiExprNode( pParser, Like(), eTok, NULL );
 -            else    
@@ -22,7 +26,7 @@ index e7025f7..38098f1 100644
              break;
          case PLUS:
              pParser->Next();
-@@ -733,9 +736,114 @@ SbiExprNode* SbiExpression::Comp()
+@@ -733,9 +739,114 @@ SbiExprNode* SbiExpression::Comp()
      return pNd;
  }