Kaydet (Commit) d835c0ff authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wswitch

Change-Id: I4fec831898b65737fe4b81b576891b28a3fb6cba
üst 380c557f
...@@ -218,13 +218,9 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const ScTokenArray& rCode,const ...@@ -218,13 +218,9 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const ScTokenArray& rCode,const
bool isAllocFormulaOclBuf = true; bool isAllocFormulaOclBuf = true;
for ( const formula::FormulaToken* p = rCodePos->First(); p; p = rCodePos->Next() ) for ( const formula::FormulaToken* p = rCodePos->First(); p; p = rCodePos->Next() )
{ {
switch ( p->GetType() ) if ( p->GetType() == formula::svDoubleVectorRef )
{ {
case formula::svDoubleVectorRef: nColPosition++;
{
nColPosition++;
break;
}
} }
} }
int nPositionSize = nColPosition * nRowSize; int nPositionSize = nColPosition * nRowSize;
...@@ -241,19 +237,16 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const ScTokenArray& rCode,const ...@@ -241,19 +237,16 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const ScTokenArray& rCode,const
int j = 0; int j = 0;
for ( const formula::FormulaToken* p = rCodeTemp->First(); p; p = rCodeTemp->Next() ) for ( const formula::FormulaToken* p = rCodeTemp->First(); p; p = rCodeTemp->Next() )
{ {
switch (p->GetType()) if (p->GetType() == formula::svDoubleVectorRef)
{ {
case formula::svDoubleVectorRef: const formula::DoubleVectorRefToken* p2 = static_cast<const formula::DoubleVectorRefToken*>(p);
{ size_t nRowStart = p2->IsStartFixed() ? 0 : i;
const formula::DoubleVectorRefToken* p2 = static_cast<const formula::DoubleVectorRefToken*>(p); size_t nRowEnd = p2->GetRefRowSize() - 1;
size_t nRowStart = p2->IsStartFixed() ? 0 : i; if (!p2->IsEndFixed())
size_t nRowEnd = p2->GetRefRowSize() - 1; nRowEnd += i;
if (!p2->IsEndFixed()) npOclStartPos[j*nRowSize+i] = nRowStart;//record the start position
nRowEnd += i; npOclEndPos[j*nRowSize+i] = nRowEnd;//record the end position
npOclStartPos[j*nRowSize+i] = nRowStart;//record the start position j++;
npOclEndPos[j*nRowSize+i] = nRowEnd;//record the end position
j++;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment