diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-01 14:45:53 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-01 14:45:53 +0100 |
| commit | c8e477e1080a6611acda757967487efd662fe07c (patch) | |
| tree | 5a3391bc27d67cb6423cfece2e264ddf426dcea4 /formula | |
| parent | dabc6ecf725f8f80a519ff452bb06ece19215f11 (diff) | |
| parent | 7ac3cbc92e93eabfbbbf65b8ac429afc28f84b2e (diff) | |
merge commit for DEV300_m63
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c236ddfb79..a657d462b5 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(); } //--------------------------------------------------------------------------- |