summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dociter.cxx5
-rw-r--r--sc/source/core/tool/interpr4.cxx2
2 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index a167c1a874ab..36e8a6681c2a 100644..100755
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -59,7 +59,7 @@ namespace {
void lcl_toUpper(OUString& rStr)
{
- rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, rStr.getLength());
+ rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<USHORT>(rStr.getLength()));
}
}
@@ -654,7 +654,8 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
else
nRow = mpParam->nRow2 + 1; // Naechste Spalte
}
- return false;
+// statement unreachable
+// return false;
}
bool ScDBQueryDataIterator::DataAccessInternal::getFirst(Value& rValue)
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 7b42b265e7fa..4e6fd94a2fb7 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1251,13 +1251,11 @@ ScDBRangeBase* ScInterpreter::PopDoubleRef()
return new ScDBInternalRange(pDok,
ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));
}
- break;
case svMatrix:
{
ScMatrixRef pMat = static_cast<ScToken*>(p)->GetMatrix();
return new ScDBExternalRange(pDok, pMat);
}
- break;
default:
SetError( errIllegalParameter);
}