From 8fce23bcdfed5be456443d25a0b229f82db8b975 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 21 Oct 2009 13:32:17 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS calc32stopper3 2009-10-12 14:26:09
 +0200 er  r276833 : disable dump again 2009-10-12 13:46:57 +0200 er  r276832
 : #i102294# setValue: yet another DST glitch 2009-10-12 13:21:48 +0200 iha 
 r276828 : #i105767# Y axis vanishes in case of zero rotated axis title
 2009-10-08 01:49:20 +0200 er  r276772 : NextSymbol: actually do reset ODF
 reference detection on file/sheet separator 2009-10-08 00:18:58 +0200 er 
 r276771 : #i101639# use TabIDs in cached RangeArrays, not RefData Tabs
 2009-10-07 19:25:47 +0200 er  r276767 : #i105200# UpdateBroadcastAreas: hash
 key changes, remove area from all slots and reinsert 2009-10-05 17:20:44
 +0200 er  r276690 : #i105365# SI prefixes for ang, ang3, m/h, m/hr 2009-10-05
 16:21:29 +0200 er  r276686 : #i105161 intersection has higher precedence than
 union

---
 formula/source/core/api/FormulaCompiler.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 4cfa28d1806d..2fd4e08deeb4 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1183,10 +1183,10 @@ void FormulaCompiler::RangeLine()
 
 //---------------------------------------------------------------------------
 
-void FormulaCompiler::UnionLine()
+void FormulaCompiler::IntersectionLine()
 {
     RangeLine();
-    while (pToken->GetOpCode() == ocUnion)
+    while (pToken->GetOpCode() == ocIntersect)
     {
         FormulaTokenRef p = pToken;
         NextToken();
@@ -1197,14 +1197,14 @@ void FormulaCompiler::UnionLine()
 
 //---------------------------------------------------------------------------
 
-void FormulaCompiler::IntersectionLine()
+void FormulaCompiler::UnionLine()
 {
-    UnionLine();
-    while (pToken->GetOpCode() == ocIntersect)
+    IntersectionLine();
+    while (pToken->GetOpCode() == ocUnion)
     {
         FormulaTokenRef p = pToken;
         NextToken();
-        UnionLine();
+        IntersectionLine();
         PutCode(p);
     }
 }
@@ -1224,7 +1224,7 @@ void FormulaCompiler::UnaryLine()
         PutCode( p );
     }
     else
-        IntersectionLine();
+        UnionLine();
 }
 
 //---------------------------------------------------------------------------