[Libreoffice-commits] .: 2 commits - connectivity/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 19 02:06:33 PST 2010
connectivity/source/commontools/parameters.cxx | 2 ++
connectivity/source/drivers/flat/ETable.cxx | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 042be3ae897d6c827c2b01cd9369745e76c720f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 18 14:36:24 2010 +0000
fix && || warning in enable-debug
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 02cc780..a014123 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -611,8 +611,8 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
sal_Unicode* pData = aStrConverted.AllocBuffer(aStr.Len());
const sal_Unicode* pStart = pData;
- OSL_ENSURE(cDecimalDelimiter && nType != DataType::INTEGER ||
- !cDecimalDelimiter && nType == DataType::INTEGER,
+ OSL_ENSURE((cDecimalDelimiter && nType != DataType::INTEGER) ||
+ (!cDecimalDelimiter && nType == DataType::INTEGER),
"FalscherTyp");
// In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln:
commit 7f0a3181795d13b7bf1fbd64f070f36011236512
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 18 14:28:57 2010 +0000
remove warnings in enable-debug
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 2a98146..58c191f 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -443,6 +443,7 @@ namespace dbtools
{
#if OSL_DEBUG_LEVEL > 0
if ( aParam->second.aInnerIndexes.size() )
+ {
if ( aParam->second.eType == eLinkedByColumnName )
{
if ( nSmallestIndexLinkedByColumnName == -1 )
@@ -452,6 +453,7 @@ namespace dbtools
{
nLargestIndexNotLinkedByColumnName = aParam->second.aInnerIndexes[ aParam->second.aInnerIndexes.size() - 1 ];
}
+ }
#endif
if ( aParam->second.eType != eFilledExternally )
continue;
More information about the Libreoffice-commits
mailing list