bool improvements

Change-Id: If35c939adede6a912dee14714a7ceeab84ac977e

21 files changed, 117 insertions, 117 deletions

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 4180bc27347e..5e99163f635c 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -43,7 +43,7 @@ namespace {
     static bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
     {
         SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::isStorageCompatible" );
-        bool bIsCompatible = sal_True;
+        bool bIsCompatible = true;
 
         if (_eType1 != _eType2)
         {
@@ -101,7 +101,7 @@ namespace {
                     break;
 
                 default:
-                    bIsCompatible = sal_False;
+                    bIsCompatible = false;
             }
         }
         return bIsCompatible;
@@ -338,7 +338,7 @@ void ORowSetValue::free()
                 break;
 
         }
-        m_bNull = sal_True;
+        m_bNull = true;
     }
 }
 // -----------------------------------------------------------------------------
@@ -507,7 +507,7 @@ ORowSetValue& ORowSetValue::operator=(const Date& _rRH)
         m_aValue.m_pValue = new Date(_rRH);
         TRACE_ALLOC( Date )
         m_eTypeKind = DataType::DATE;
-        m_bNull = sal_False;
+        m_bNull = false;
     }
     else
         *(Date*)m_aValue.m_pValue = _rRH;
@@ -525,7 +525,7 @@ ORowSetValue& ORowSetValue::operator=(const Time& _rRH)
         m_aValue.m_pValue = new Time(_rRH);
         TRACE_ALLOC( Time )
         m_eTypeKind = DataType::TIME;
-        m_bNull = sal_False;
+        m_bNull = false;
     }
     else
         *(Time*)m_aValue.m_pValue = _rRH;
@@ -542,7 +542,7 @@ ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH)
         m_aValue.m_pValue = new DateTime(_rRH);
         TRACE_ALLOC( DateTime )
         m_eTypeKind = DataType::TIMESTAMP;
-        m_bNull = sal_False;
+        m_bNull = false;
     }
     else
         *(DateTime*)m_aValue.m_pValue = _rRH;
@@ -556,7 +556,7 @@ ORowSetValue& ORowSetValue::operator=(const OUString& _rRH)
     if(m_eTypeKind != DataType::VARCHAR || m_aValue.m_pString != _rRH.pData)
     {
         free();
-        m_bNull = sal_False;
+        m_bNull = false;
 
         m_aValue.m_pString = _rRH.pData;
         rtl_uString_acquire(m_aValue.m_pString);
@@ -574,7 +574,7 @@ ORowSetValue& ORowSetValue::operator=(const double& _rRH)
 
     m_aValue.m_nDouble = _rRH;
     m_eTypeKind = DataType::DOUBLE;
-    m_bNull = sal_False;
+    m_bNull = false;
 
     return *this;
 }
@@ -586,7 +586,7 @@ ORowSetValue& ORowSetValue::operator=(const float& _rRH)
 
     m_aValue.m_nFloat = _rRH;
     m_eTypeKind = DataType::FLOAT;
-    m_bNull = sal_False;
+    m_bNull = false;
 
     return *this;
 }
@@ -599,8 +599,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int8& _rRH)
 
     m_aValue.m_nInt8 = _rRH;
     m_eTypeKind = DataType::TINYINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_True;
+    m_bNull = false;
+    m_bSigned = true;
     return *this;
 }
 // -------------------------------------------------------------------------
@@ -612,8 +612,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt8& _rRH)
 
     m_aValue.m_uInt8 = _rRH;
     m_eTypeKind = DataType::TINYINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_False;
+    m_bNull = false;
+    m_bSigned = false;
     return *this;
 }
 // -------------------------------------------------------------------------
@@ -625,8 +625,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int16& _rRH)
 
     m_aValue.m_nInt16 = _rRH;
     m_eTypeKind = DataType::SMALLINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_True;
+    m_bNull = false;
+    m_bSigned = true;
 
     return *this;
 }
@@ -639,8 +639,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt16& _rRH)
 
     m_aValue.m_uInt16 = _rRH;
     m_eTypeKind = DataType::SMALLINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_False;
+    m_bNull = false;
+    m_bSigned = false;
 
     return *this;
 }
@@ -654,8 +654,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int32& _rRH)
     m_aValue.m_nInt32 = _rRH;
 
     m_eTypeKind = DataType::INTEGER;
-    m_bNull = sal_False;
-    m_bSigned = sal_True;
+    m_bNull = false;
+    m_bSigned = true;
 
     return *this;
 }
@@ -669,8 +669,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt32& _rRH)
     m_aValue.m_uInt32 = _rRH;
 
     m_eTypeKind = DataType::INTEGER;
-    m_bNull = sal_False;
-    m_bSigned = sal_False;
+    m_bNull = false;
+    m_bSigned = false;
 
     return *this;
 }
@@ -683,7 +683,7 @@ ORowSetValue& ORowSetValue::operator=(const bool _rRH)
 
     m_aValue.m_bBool = _rRH;
     m_eTypeKind = DataType::BOOLEAN;
-    m_bNull = sal_False;
+    m_bNull = false;
 
     return *this;
 }
@@ -695,8 +695,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_Int64& _rRH)
 
     m_aValue.m_nInt64 = _rRH;
     m_eTypeKind = DataType::BIGINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_True;
+    m_bNull = false;
+    m_bSigned = true;
 
     return *this;
 }
@@ -708,8 +708,8 @@ ORowSetValue& ORowSetValue::operator=(const sal_uInt64& _rRH)
 
     m_aValue.m_uInt64 = _rRH;
     m_eTypeKind = DataType::BIGINT;
-    m_bNull = sal_False;
-    m_bSigned = sal_False;
+    m_bNull = false;
+    m_bSigned = false;
 
     return *this;
 }
@@ -728,7 +728,7 @@ ORowSetValue& ORowSetValue::operator=(const Sequence<sal_Int8>& _rRH)
         *static_cast< Sequence< sal_Int8 >* >(m_aValue.m_pValue) = _rRH;
 
     m_eTypeKind = DataType::LONGVARBINARY;
-    m_bNull = sal_False;
+    m_bNull = false;
 
     return *this;
 }
@@ -747,7 +747,7 @@ ORowSetValue& ORowSetValue::operator=(const Any& _rAny)
         *static_cast<Any*>(m_aValue.m_pValue) = _rAny;
 
     m_eTypeKind = DataType::OBJECT;
-    m_bNull = sal_False;
+    m_bNull = false;
 
     return *this;
 }
@@ -1067,7 +1067,7 @@ OUString ORowSetValue::getString( ) const
 bool ORowSetValue::getBool()    const
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getBool" );
-    bool bRet = sal_False;
+    bool bRet = false;
     if(!m_bNull)
     {
         switch(getTypeKind())
@@ -1109,7 +1109,7 @@ bool ORowSetValue::getBool()    const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
-                OSL_ASSERT(!"getBool() for this type is not allowed!");
+                OSL_FAIL("getBool() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1171,7 +1171,7 @@ sal_Int8 ORowSetValue::getInt8()    const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getInt8() for this type is not allowed!");
+                OSL_FAIL("getInt8() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1242,7 +1242,7 @@ sal_uInt8 ORowSetValue::getUInt8()    const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getuInt8() for this type is not allowed!");
+                OSL_FAIL("getuInt8() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1317,7 +1317,7 @@ sal_Int16 ORowSetValue::getInt16()  const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getInt16() for this type is not allowed!");
+                OSL_FAIL("getInt16() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1388,7 +1388,7 @@ sal_uInt16 ORowSetValue::getUInt16()  const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getuInt16() for this type is not allowed!");
+                OSL_FAIL("getuInt16() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1462,7 +1462,7 @@ sal_Int32 ORowSetValue::getInt32()  const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getInt32() for this type is not allowed!");
+                OSL_FAIL("getInt32() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1535,7 +1535,7 @@ sal_uInt32 ORowSetValue::getUInt32()  const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getuInt32() for this type is not allowed!");
+                OSL_FAIL("getuInt32() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1609,7 +1609,7 @@ sal_Int64 ORowSetValue::getLong()   const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getLong() for this type is not allowed!");
+                OSL_FAIL("getLong() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1682,7 +1682,7 @@ sal_uInt64 ORowSetValue::getULong()   const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getULong() for this type is not allowed!");
+                OSL_FAIL("getULong() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1760,7 +1760,7 @@ float ORowSetValue::getFloat()  const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getDouble() for this type is not allowed!");
+                OSL_FAIL("getDouble() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -1839,7 +1839,7 @@ double ORowSetValue::getDouble()    const
             case DataType::LONGVARBINARY:
             case DataType::BLOB:
             case DataType::CLOB:
-                OSL_ASSERT(!"getDouble() for this type is not allowed!");
+                OSL_FAIL("getDouble() for this type is not allowed!");
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
@@ -2262,7 +2262,7 @@ namespace detail
 void ORowSetValue::fill( const sal_Int32 _nType, const Reference< XColumn >& _rxColumn )
 {
     detail::ColumnValue aColumnValue( _rxColumn );
-    impl_fill( _nType, sal_True, aColumnValue );
+    impl_fill( _nType, true, aColumnValue );
 }
 
 // -----------------------------------------------------------------------------
@@ -2278,7 +2278,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
                      const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (1)" );
-    fill(_nPos,_nType,sal_True,_xRow);
+    fill(_nPos,_nType,true,_xRow);
 }
 
 // -----------------------------------------------------------------------------
@@ -2286,7 +2286,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
 
 {
     SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (2)" );
-    bool bReadData = sal_True;
+    bool bReadData = true;
     switch(_nType)
     {
     case DataType::CHAR:
@@ -2380,7 +2380,7 @@ void ORowSetValue::fill(const Any& _rValue)
             setNull();            break;
         case TypeClass_BOOLEAN:
         {
-            bool bValue( sal_False );
+            bool bValue( false );
             _rValue >>= bValue;
             (*this) = bValue;
             break;
@@ -2446,7 +2446,7 @@ void ORowSetValue::fill(const Any& _rValue)
             sal_uInt32 nValue(0);
             _rValue >>= nValue;
             (*this) = static_cast<sal_Int64>(nValue);
-            setSigned(sal_False);
+            setSigned(false);
             break;
         }
         case TypeClass_HYPER:
@@ -2461,7 +2461,7 @@ void ORowSetValue::fill(const Any& _rValue)
             sal_uInt64 nValue(0);
             _rValue >>= nValue;
             (*this) = nValue;
-            setSigned(sal_False);
+            setSigned(false);
             break;
         }
         case TypeClass_ENUM:
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 0d04af9510a3..ca69ce7074ee 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -394,7 +394,7 @@ namespace dbtools
                     OSQLParseNode* pFuncSpecParent = pOdbcSpec->getParent();
                     OSL_ENSURE( pFuncSpecParent, "OPredicateInputController::getPredicateValue: an ODBC func spec node without parent?" );
                     if ( pFuncSpecParent )
-                        pFuncSpecParent->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True);
+                        pFuncSpecParent->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext(), false, true);
                 }
                 else
                 {
@@ -402,7 +402,7 @@ namespace dbtools
                     if ( SQL_NODE_STRING == pValueNode->getNodeType() )
                         sReturn = pValueNode->getTokenValue();
                     else
-                        pValueNode->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True);
+                        pValueNode->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext(), false, true);
                 }
             }
             else
@@ -417,12 +417,12 @@ namespace dbtools
                             sReturn = pValueNode->getTokenValue();
                         else
                             pValueNode->parseNodeToStr(
-                                sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True
+                                sReturn, m_xConnection, &m_aParser.getContext(), false, true
                             );
                     }
                     else
                         pValueNode->parseNodeToStr(
-                            sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True
+                            sReturn, m_xConnection, &m_aParser.getContext(), false, true
                         );
                 }
                 else
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 46237e707723..d51fa57767cf 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -195,7 +195,7 @@ sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSet
     }
     catch (Exception&)
     {
-        OSL_ASSERT(0);
+        OSL_ASSERT(false);
         return sal_False;
     }
     return sal_True;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index a90a63e4d4b7..dc0ba14ed1dc 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -645,7 +645,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
     }
     catch(const Exception&)
     {
-        OSL_ASSERT(0);
+        OSL_ASSERT(false);
     }
     return sURL;
 }
@@ -2514,15 +2514,15 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
     if(_nPos)
     {
         aInsertRow = new OValueRefVector(_pNewTable->m_pColumns->getCount());
-        ::std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(sal_True));
+        ::std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(true));
     }
     else
         aInsertRow = aRow;
 
     // we only have to bind the values which we need to copy into the new table
-    ::std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(sal_True));
+    ::std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(true));
     if(_nPos && (_nPos < (sal_Int32)aRow->get().size()))
-        (aRow->get())[nPos]->setBound(sal_False);
+        (aRow->get())[nPos]->setBound(false);
 
 
     sal_Bool bOk = sal_True;
@@ -2558,7 +2558,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
         }
         else
         {
-            OSL_ASSERT(0);
+            OSL_ASSERT(false);
         }
     } // for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos)
 }
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 963a4009b008..b795ea869098 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -52,7 +52,7 @@ ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
     if (!aStr.isEmpty())
     {
         xValue = aStr;
-        xValue.setBound(sal_True);
+        xValue.setBound(true);
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 4bff96debd98..2cc664bcfb0d 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -615,7 +615,7 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pCo
     ,m_pStatement(pStmt)
     ,m_pConnection(pConnection)
     ,m_xMetaData(NULL)
-    ,m_bWasNull(sal_True)
+    ,m_bWasNull(true)
     ,m_nFetchSize(0)
     ,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
     ,m_nFetchDirection(FetchDirection::FORWARD)
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 11da82b290b0..add766d87e25 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -672,7 +672,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
     m_bRowDeleted = m_pTable->DeleteRow(*m_xColumns);
     if(m_bRowDeleted && m_pFileSet.is())
     {
-        m_aRow->setDeleted(sal_True);
+        m_aRow->setDeleted(true);
         // don't touch the m_pFileSet member here
         m_aSkipDeletedSet.deletePosition(nPos);
     }
@@ -695,7 +695,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
         OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1;
         for(;aIter != m_aInsertRow->get().end();++aIter)
         {
-            (*aIter)->setBound(sal_False);
+            (*aIter)->setBound(false);
             (*aIter)->setNull();
         }
     }
@@ -716,7 +716,7 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
     OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1;
     for(;aIter != m_aInsertRow->get().end();++aIter)
     {
-        (*aIter)->setBound(sal_False);
+        (*aIter)->setBound(false);
         (*aIter)->setNull();
     }
 }
@@ -736,7 +736,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
     checkIndex(columnIndex );
     columnIndex = mapColumn(columnIndex);
 
-    (m_aInsertRow->get())[columnIndex]->setBound(sal_True);
+    (m_aInsertRow->get())[columnIndex]->setBound(true);
     *(m_aInsertRow->get())[columnIndex] = x;
 }
 // -----------------------------------------------------------------------------
@@ -1184,7 +1184,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32
             {
                 *(m_aRow->get())[1] = m_nRowCountResult;
                 *(m_aRow->get())[0] = sal_Int32(1);
-                (m_aRow->get())[1]->setBound(sal_True);
+                (m_aRow->get())[1]->setBound(true);
                 (m_aSelectRow->get())[1] = (m_aRow->get())[1];
             }
         }
@@ -1300,7 +1300,7 @@ void OResultSet::sortRows()
                 SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Datentyp nicht implementiert");
                 break;
         }
-        (m_aSelectRow->get())[*aOrderByIter]->setBound(sal_True);
+        (m_aSelectRow->get())[*aOrderByIter]->setBound(true);
     }
 
     m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending);
@@ -1651,7 +1651,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
             ++i, ++aRowIter
         )
     {
-        (*aRowIter)->setBound(sal_False);
+        (*aRowIter)->setBound(false);
         try
         {
             // get the table column and it's name
@@ -1687,7 +1687,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                         (_rSelectRow->get())[nSelectColumnPos] = *aRowIter;
                     }
 
-                    (*aRowIter)->setBound(sal_True);
+                    (*aRowIter)->setBound(true);
                     sal_Int32 nType = DataType::OTHER;
                     if (xTableColumn.is())
                         xTableColumn->getPropertyValue(sType) >>= nType;
@@ -1775,7 +1775,7 @@ void OResultSet::doTableSpecials(const OSQLTable& _xTable)
 void OResultSet::clearInsertRow()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearInsertRow" );
-    m_aRow->setDeleted(sal_False); // set to false here because this is the new row
+    m_aRow->setDeleted(false); // set to false here because this is the new row
     OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin();
     const OValueRefVector::Vector::iterator aEnd = m_aInsertRow->get().end();
     for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
@@ -1786,7 +1786,7 @@ void OResultSet::clearInsertRow()
             (m_aRow->get())[nPos]->setValue( (*aIter)->getValue() );
         }
         rValue->setBound(nPos == 0);
-        rValue->setModified(sal_False);
+        rValue->setModified(false);
         rValue->setNull();
     }
 }
@@ -1797,8 +1797,8 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
     if(!_rRow.is())
     {
         _rRow   = new OValueRefVector(_nColumnCount);
-        (_rRow->get())[0]->setBound(sal_True);
-        ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(sal_False));
+        (_rRow->get())[0]->setBound(true);
+        ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(false));
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 44e6b2f0c812..984a806c6636 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -365,7 +365,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
         aColumnName = pColumnRef->getChild(0)->getTokenValue();
     else if (pColumnRef->count() == 3)
     {
-        pColumnRef->getChild(2)->parseNodeToStr( aColumnName, getOwnConnection(), NULL, sal_False, sal_False );
+        pColumnRef->getChild(2)->parseNodeToStr( aColumnName, getOwnConnection(), NULL, false, false );
     }
     else
     {
@@ -440,18 +440,18 @@ void OStatement_Base::construct(const OUString& sql)  throw(SQLException, Runtim
         Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY);
         // set the binding of the resultrow
         m_aRow          = new OValueRefVector(xNames->getCount());
-        (m_aRow->get())[0]->setBound(sal_True);
-        ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(sal_False));
+        (m_aRow->get())[0]->setBound(true);
+        ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(false));
 
         // set the binding of the resultrow
         m_aEvaluateRow  = new OValueRefVector(xNames->getCount());
 
-        (m_aEvaluateRow->get())[0]->setBound(sal_True);
-        ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(sal_False));
+        (m_aEvaluateRow->get())[0]->setBound(true);
+        ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(false));
 
         // set the select row
         m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->get().size());
-        ::std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(sal_True));
+        ::std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(true));
 
         // create the column mapping
         createColumnMapping();
@@ -521,7 +521,7 @@ void OStatement_Base::GetAssignValues()
         sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
         m_aAssignValues = new OAssignValues(nCount);
         // unbound all
-        ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False));
+        ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false));
 
         m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER);
 
@@ -609,7 +609,7 @@ void OStatement_Base::GetAssignValues()
         sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
         m_aAssignValues = new OAssignValues(nCount);
         // unbound all
-        ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False));
+        ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false));
 
         m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER);
 
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index fb3883cb572b..ba787a7cc8e4 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -86,7 +86,7 @@ void OOperandRow::bindValue(const OValueRefRow& _pRow)
     OSL_ENSURE(_pRow.is(),"NO EMPTY row allowed!");
     m_pRow = _pRow;
     OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
-    (m_pRow->get())[m_nRowPos]->setBound(sal_True);
+    (m_pRow->get())[m_nRowPos]->setBound(true);
 }
 // -----------------------------------------------------------------------------
 void OOperandRow::setValue(const ORowSetValue& _rVal)
@@ -160,13 +160,13 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
     case SQL_NODE_STRING:
         m_aValue = aStrValue;
         m_eDBType = DataType::VARCHAR;
-        m_aValue.setBound(sal_True);
+        m_aValue.setBound(true);
         return;
     case SQL_NODE_INTNUM:
     case SQL_NODE_APPROXNUM:
         m_aValue = aStrValue.toDouble();
         m_eDBType = DataType::DOUBLE;
-        m_aValue.setBound(sal_True);
+        m_aValue.setBound(true);
         return;
     default:
         break;
@@ -186,7 +186,7 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
     {
         SAL_WARN( "connectivity.drivers", "Parse Error");
     }
-    m_aValue.setBound(sal_True);
+    m_aValue.setBound(true);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index f555e2f4a3a2..ce5ef145cddf 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -82,7 +82,7 @@ Connection::Connection(FirebirdDriver*    _pDriver)
     , m_sFirebirdURL()
     , m_bIsEmbedded(sal_False)
     , m_xEmbeddedStorage(0)
-    , m_bIsFile(sal_False)
+    , m_bIsFile(false)
     , m_sUser()
     , m_bIsAutoCommit(sal_False)
     , m_bIsReadOnly(sal_False)
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index bcc866d48795..e7c2e23abc3a 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -511,7 +511,7 @@ OUString OFlatTable::getEntry()
     }
     catch(const Exception&)
     {
-        OSL_ASSERT(0);
+        OSL_ASSERT(false);
     }
     return sURL;
 }
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 5ccb98d4e38e..7baac6653c6e 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1405,7 +1405,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
                         _rColMapping[nSelectColumnPos] = nTableColumnPos;
                     }
 
-                    aRowIter->setBound(sal_True);
+                    aRowIter->setBound(true);
                     aRowIter->setTypeKind(DataType::VARCHAR);
                 }
             }
@@ -1672,7 +1672,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
     checkIndex(columnIndex );
     columnIndex = mapColumn(columnIndex);
 
-    (m_aRow->get())[columnIndex].setBound(sal_True);
+    (m_aRow->get())[columnIndex].setBound(true);
     (m_aRow->get())[columnIndex] = x;
     m_nUpdatedRow = getCurrentCardNumber();
 //    m_RowStates = m_RowStates | RowStates_Updated;
@@ -1690,7 +1690,7 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
     checkIndex(columnIndex );
     columnIndex = mapColumn(columnIndex);
 
-    (m_aRow->get())[columnIndex].setBound(sal_True);
+    (m_aRow->get())[columnIndex].setBound(true);
     (m_aRow->get())[columnIndex].setNull();
     m_nUpdatedRow = getCurrentCardNumber();
 //    m_RowStates = m_RowStates | RowStates_Updated;
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 2418877570dc..0d719b591efb 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -239,8 +239,8 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
             xNames = Reference<XIndexAccess>(m_xColNames,UNO_QUERY);
             // set the binding of the resultrow
             m_aRow          = new OValueVector(xNames->getCount());
-            (m_aRow->get())[0].setBound(sal_True);
-            ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(sal_False));
+            (m_aRow->get())[0].setBound(true);
+            ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(false));
             // create the column mapping
             createColumnMapping();
 
@@ -560,7 +560,7 @@ void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
         aColumnName = pColumnRef->getChild(0)->getTokenValue();
     else if (pColumnRef->count() == 3)
     {
-        pColumnRef->getChild(2)->parseNodeToStr( aColumnName, getOwnConnection(), NULL, sal_False, sal_False );
+        pColumnRef->getChild(2)->parseNodeToStr( aColumnName, getOwnConnection(), NULL, false, false );
     }
     else
     {
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index e8d1d3323641..3541ea8dd3e5 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -80,7 +80,7 @@ void OMySQLCatalog::refreshViews()
     // as of this writing might not return the proper information in getTableTypes, so
     // don't rely on it.
     // during #73245# / 2007-10-26 / frank.schoenheit@sun.com
-    bool bSupportsViews = sal_True;
+    bool bSupportsViews = true;
 
     TStringVector aVector;
     if ( bSupportsViews )
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 11e36b3851c6..f15021b15511 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2167,9 +2167,9 @@ struct TypeInfoByDataTypeSorter
             a[0 /*TYPE_NAME*/] >>= nameA;
             b[0 /*TYPE_NAME*/] >>= nameB;
             if( nameA.startsWith( "int4" ) )
-                return 1;
+                return true;
             if( nameB.startsWith( "int4" ) )
-                return 0;
+                return false;
             return nameA.compareTo( nameB ) < 0;
         }
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index afb296565898..f79a0979af9a 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -345,7 +345,7 @@ OUString extractTableFromInsert( const OUString & sql )
                         {
                             // the second part of the table name does not use quotes
                             // parse on
-                            quote = 0;
+                            quote = false;
                         }
                     }
                     else
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 3ff17784aa4b..6843d97c06e1 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -465,13 +465,13 @@ void Container::fire( const EventBroadcastHelper &helper )
             }
             catch ( com::sun::star::uno::RuntimeException & )
             {
-                OSL_ENSURE( 0, "exception catched" );
+                OSL_ENSURE( false, "exception catched" );
                 // loose coupling, a runtime exception shall not break anything
                 // TODO: log away as warning !
             }
             catch( com::sun::star::uno::Exception & )
             {
-                OSL_ENSURE( 0, "exception from listener flying through" );
+                OSL_ENSURE( false, "exception from listener flying through" );
                 throw;
             }
         }
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 752b9a253c1a..e1dd02fb4a50 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -174,7 +174,7 @@ namespace connectivity
             OOperandResultBOOL(sal_Bool bResult) : OOperandResult(::com::sun::star::sdbc::DataType::BIT)
             {
                 m_aValue = bResult ? 1.0 : 0.0;
-                m_aValue.setBound(sal_True);
+                m_aValue.setBound(true);
             }
         };
 
@@ -184,7 +184,7 @@ namespace connectivity
             OOperandResultNUM(double fNum) : OOperandResult(::com::sun::star::sdbc::DataType::DOUBLE)
             {
                 m_aValue = fNum;
-                m_aValue.setBound(sal_True);
+                m_aValue.setBound(true);
             }
         };
 
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index ae9fff2b2202..31a69ae4ff89 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -731,7 +731,7 @@ namespace
             if( _pColumnRef->count() > 1 )
             {
                 for ( sal_Int32 i=0; i<((sal_Int32)_pColumnRef->count())-2; ++i )
-                    _pColumnRef->getChild(i)->parseNodeToStr( _out_rTableRange, _rxConnection, NULL, sal_False, sal_False );
+                    _pColumnRef->getChild(i)->parseNodeToStr( _out_rTableRange, _rxConnection, NULL, false, false );
                 _out_rColumnName = _pColumnRef->getChild( _pColumnRef->count()-1 )->getChild(0)->getTokenValue();
             }
             else
@@ -849,24 +849,24 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode,
                 }
             }
             if (aTableRange.isEmpty())
-                return sal_False;
+                return false;
         }
 
 
         if (rTableRange.isEmpty())
             rTableRange = aTableRange;
         else if (rTableRange != aTableRange)
-            return sal_False;
+            return false;
     }
     else
     {
         for (sal_uInt32 i = 0, ncount = pNode->count(); i < ncount; i++)
         {
             if (!getColumnTableRange(pNode->getChild(i), rTableRange))
-                return sal_False;
+                return false;
         }
     }
-    return sal_True;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -973,7 +973,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
             {
                 // All the table's columns
                 OUString aTableRange;
-                pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+                pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, false, false );
                 setSelectColumnName(m_aSelectColumns,OUString("*"), aEmptyString,aTableRange);
                 continue;
             }
@@ -1004,7 +1004,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
                          SQL_ISRULE(pColumnRef,num_value_exp)   || SQL_ISRULE(pColumnRef,term))*/
                 {
                     // Function call present
-                    pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_True );
+                    pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, false, true );
                     // check if the column is also a parameter
                     traverseSearchCondition(pColumnRef); // num_value_exp
 
@@ -1111,7 +1111,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
         }
         else
         {   // here I found a predicate
-            pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+            pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, false, false );
         }
         OSL_ENSURE(!sColumnName.isEmpty(),"sColumnName must not be empty!");
         if ( _bOrder )
@@ -1174,7 +1174,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
             if ( SQL_ISRULE( pOther, column_ref ) )
                 getColumnRange( pOther, sColumnName, sTableRange, aColumnAlias);
             else
-                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, false, false );
         } // if ( SQL_ISRULE(pParent,comparison_predicate) ) // x = X
         else if ( SQL_ISRULE(pParent,other_like_predicate_part_2) )
         {
@@ -1182,7 +1182,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
             if ( SQL_ISRULE( pOther, column_ref ) )
                 getColumnRange( pOther, sColumnName, sTableRange, aColumnAlias);
             else
-                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, false, false );
         }
         else if ( SQL_ISRULE(pParent,between_predicate_part_2) )
         {
@@ -1191,7 +1191,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
                 getColumnRange( pOther, sColumnName, sTableRange, aColumnAlias);
             else
             {
-                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+                pOther->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, false, false );
                 lcl_generateParameterName( *pParent, *_pNode );
             }
         }
@@ -1315,7 +1315,7 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi
     else if (SQL_ISRULE(pSearchCondition,comparison_predicate) )
     {
         OUString aValue;
-        pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+        pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, false, false );
         traverseOnePredicate(pSearchCondition->getChild(0),aValue,pSearchCondition->getChild(2));
         impl_fillJoinConditions(pSearchCondition);
 //      if (! aIteratorStatus.IsSuccessful())
@@ -1349,7 +1349,7 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi
             aValue = pNum_value_exp->getTokenValue();
         else
         {
-            pNum_value_exp->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+            pNum_value_exp->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, false, false );
             pParam = pNum_value_exp;
         }
 
@@ -1444,7 +1444,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
     if ( _pParentNode && (SQL_ISRULE(_pParentNode,general_set_fct) || SQL_ISRULE(_pParentNode,set_fct_spec)) )
     {// found a function as column_ref
         OUString sFunctionName;
-        _pParentNode->getChild(0)->parseNodeToStr( sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+        _pParentNode->getChild(0)->parseNodeToStr( sFunctionName, m_pImpl->m_xConnection, NULL, false, false );
         const sal_uInt32 nCount = _pParentNode->count();
         sal_uInt32 i = 0;
         for(; i < nCount;++i)
@@ -2167,7 +2167,7 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo
     OUString sFunctionName;
     if ( SQL_ISRULE(_pNode,length_exp) )
     {
-        _pNode->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+        _pNode->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, false, false );
         nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() );
     }
     else if ( SQL_ISRULE(_pNode,num_value_exp) || SQL_ISRULE(_pNode,term) || SQL_ISRULE(_pNode,factor) )
@@ -2176,7 +2176,7 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo
     }
     else
     {
-        _pNode->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+        _pNode->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, false, false );
 
         // MIN and MAX have another return type, we have to check the expression itself.
         // @see http://qa.openoffice.org/issues/show_bug.cgi?id=99566
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index fe59e8108e23..2e60e8e88bf6 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -292,7 +292,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
     OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
 
     if (xFormatter.is())
-        parseNodeToStr(rString, _rxConnection, xFormatter, NULL, OUString(), rIntl, pContext, sal_True, sal_True, _cDec, true, false);
+        parseNodeToStr(rString, _rxConnection, xFormatter, NULL, OUString(), rIntl, pContext, true, true, _cDec, true, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -1215,7 +1215,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
         }
         catch ( Exception& )
         {
-            OSL_ASSERT(0);
+            OSL_ASSERT(false);
         }
 
         if (m_nFormatKey && m_xFormatter.is())
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index ebcc9538f118..694a2727ff15 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -567,7 +567,7 @@ void OCollection::disposeElements()
 // -----------------------------------------------------------------------------
 Reference< XPropertySet > OCollection::createDescriptor()
 {
-    OSL_ASSERT(!"Need to be overloaded when used!");
+    OSL_FAIL("Need to be overloaded when used!");
     throw SQLException();
 }
 // -----------------------------------------------------------------------------