diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-29 11:00:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-29 11:08:32 +0100 |
| commit | 8a8ea11e5ea386af8b91b2ff36e5906afc571c2b (patch) | |
| tree | 748510cf980d2d46bedd9967b1771d037d4a6eee /connectivity | |
| parent | Unbreak Cygwin patch handling (diff) | |
| download | core-8a8ea11e5ea386af8b91b2ff36e5906afc571c2b.tar.gz core-8a8ea11e5ea386af8b91b2ff36e5906afc571c2b.zip | |
bool improvements
Change-Id: I4e428e5d7093dbc8a1e7fd47ec49998ce143e5ac
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OTools.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSet.hxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index 8e442f2e4c42..4c7ad027c576 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -654,7 +654,7 @@ sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType) nValue = DataType::LONGVARBINARY; break; default: - OSL_ASSERT(!"Invalid type"); + OSL_FAIL("Invalid type"); } return nValue; } diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 35959a52795a..84be364ac636 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -84,14 +84,14 @@ namespace connectivity for(i=0;i < nCount;++i,--pLHBack,--pRHBack) { if(!(*pLHBack) && *pRHBack) - return sal_True; + return true; else if(*pLHBack && !(*pRHBack)) - return sal_False; + return false; } for(i=0,++pLHBack,++pRHBack;i < nCount;++pLHBack,++pRHBack,++i) if(*pLHBack < *pRHBack) - return sal_True; - return sal_False; + return true; + return false; } else return *reinterpret_cast<const sal_Int32*>(_rLH.getConstArray()) < *reinterpret_cast<const sal_Int32*>(_rRH.getConstArray()); |