strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS calc32stopper3

Browse source 
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
This commit is contained in:
Vladimir Glazounov 2009-10-21 13:32:17 +00:00
parent 29983d4561
commit 8fce23bcdf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
formula/source/core/api/FormulaCompiler.cxx
View file

@ -1183,10 +1183,10 @@ void FormulaCompiler::RangeLine()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void FormulaCompiler::UnionLine() void FormulaCompiler::IntersectionLine()
{ {
RangeLine(); RangeLine();
while (pToken->GetOpCode() == ocUnion) while (pToken->GetOpCode() == ocIntersect)
{ {
FormulaTokenRef p = pToken; FormulaTokenRef p = pToken;
NextToken(); NextToken();
@ -1197,14 +1197,14 @@ void FormulaCompiler::UnionLine()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void FormulaCompiler::IntersectionLine() void FormulaCompiler::UnionLine()
{ {
UnionLine(); IntersectionLine();
while (pToken->GetOpCode() == ocIntersect) while (pToken->GetOpCode() == ocUnion)
{ {
FormulaTokenRef p = pToken; FormulaTokenRef p = pToken;
NextToken(); NextToken();
UnionLine(); IntersectionLine();
PutCode(p); PutCode(p);
} }
} }
@ -1224,7 +1224,7 @@ void FormulaCompiler::UnaryLine()
PutCode( p ); PutCode( p );
} }
else else
IntersectionLine(); UnionLine();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------