connectivity: sal_Bool->bool

Change-Id: I96371121ce6697f153f4e973e65831ea2265eb56

10 files changed, 77 insertions, 77 deletions

diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 1c59b3f1210b..ce09e86def23 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -137,7 +137,7 @@ namespace connectivity
             // Sets the flag indicating if this is an OUTPUT parameter
 
 
-            void setOutputParameter (sal_Bool output)
+            void setOutputParameter (bool output)
             {
                 outputParameter = output;
             }
@@ -147,7 +147,7 @@ namespace connectivity
             // Gets the OUTPUT parameter flag
 
 
-            sal_Bool isOutputParameter ()
+            bool isOutputParameter ()
             {
                 return outputParameter;
             }
@@ -177,7 +177,7 @@ namespace connectivity
             sal_Int32 sqlType;                          // Java SQL type used to
                                                             // register an OUT parameter
 
-            sal_Bool outputParameter;   // true for OUTPUT parameters
+            bool outputParameter;   // true for OUTPUT parameters
         };
     }
 }
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 077bc85814b5..ade4b76e53ad 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -60,25 +60,25 @@ namespace connectivity
                                                         //  DatabaseMetaData.getTypeInfo.
 
 
-            ::com::sun::star::sdbc::SQLWarning  m_aLastWarning; //      Last SQLWarning generated by
-                                                        //  an operation
-            OUString m_sUser;        // the user name
+            ::com::sun::star::sdbc::SQLWarning  m_aLastWarning; //  Last SQLWarning generated by
+                                                                //  an operation
+            OUString        m_sUser;        //  the user name
             ODBCDriver*     m_pDriver;      //  Pointer to the owning
                                             //  driver object
 
             SQLHANDLE       m_aConnectionHandle;
             SQLHANDLE       m_pDriverHandleCopy;    // performance reason
             sal_Int32       m_nStatementCount;
-            sal_Bool        m_bClosed;
-            sal_Bool        m_bUseCatalog;  // should we use the catalog on filebased databases
-            sal_Bool        m_bUseOldDateFormat;
-            sal_Bool        m_bParameterSubstitution;
-            sal_Bool        m_bIgnoreDriverPrivileges;
-            sal_Bool        m_bPreventGetVersionColumns;    // #i60273#
-            sal_Bool        m_bReadOnly;
+            bool            m_bClosed;
+            bool            m_bUseCatalog;  // should we use the catalog on filebased databases
+            bool            m_bUseOldDateFormat;
+            bool            m_bParameterSubstitution;
+            bool            m_bIgnoreDriverPrivileges;
+            bool            m_bPreventGetVersionColumns;    // #i60273#
+            bool            m_bReadOnly;
 
 
-            SQLRETURN       OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent);
+            SQLRETURN       OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, bool bSilent);
 
             virtual OConnection*    cloneConnection(); // creates a new connection
 
@@ -127,11 +127,11 @@ namespace connectivity
             SQLHANDLE       getConnection() { return m_aConnectionHandle; }
 
             // should we use the catalog on filebased databases
-            inline sal_Bool     isCatalogUsed()                     const { return m_bUseCatalog; }
-            inline sal_Bool     isParameterSubstitutionEnabled()    const { return m_bParameterSubstitution; }
-            inline sal_Bool     isIgnoreDriverPrivilegesEnabled()   const { return m_bIgnoreDriverPrivileges; }
-            inline sal_Bool     preventGetVersionColumns()          const { return m_bPreventGetVersionColumns; }
-            inline sal_Bool     useOldDateFormat()                  const { return m_bUseOldDateFormat; }
+            inline bool     isCatalogUsed()                     const { return m_bUseCatalog; }
+            inline bool     isParameterSubstitutionEnabled()    const { return m_bParameterSubstitution; }
+            inline bool     isIgnoreDriverPrivilegesEnabled()   const { return m_bIgnoreDriverPrivileges; }
+            inline bool     preventGetVersionColumns()          const { return m_bPreventGetVersionColumns; }
+            inline bool     useOldDateFormat()                  const { return m_bUseOldDateFormat; }
             inline SQLHANDLE        getDriverHandle()               const { return m_pDriverHandleCopy;}
             inline ODBCDriver*      getDriver()                     const { return m_pDriver;}
             inline OUString getUserName()                    const { return m_sUser; }
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 4870bec23fdd..3b40e4455b32 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -37,23 +37,23 @@ namespace connectivity
         {
             SQLHANDLE       m_aConnectionHandle;
             OConnection*    m_pConnection;
-            sal_Bool        m_bUseCatalog;
-            sal_Bool        m_bOdbc3;
+            bool        m_bUseCatalog;
+            bool        m_bOdbc3;
 
             // cached database information
-            virtual OUString impl_getIdentifierQuoteString_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_isCatalogAtStart_throw(  ) SAL_OVERRIDE;
-            virtual OUString impl_getCatalogSeparator_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_supportsCatalogsInTableDefinitions_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_supportsSchemasInTableDefinitions_throw(  ) SAL_OVERRIDE ;
-            virtual sal_Bool        impl_supportsCatalogsInDataManipulation_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_supportsSchemasInDataManipulation_throw(  ) SAL_OVERRIDE ;
-            virtual sal_Bool        impl_supportsMixedCaseQuotedIdentifiers_throw(  ) SAL_OVERRIDE ;
-            virtual sal_Bool        impl_supportsAlterTableWithAddColumn_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_supportsAlterTableWithDropColumn_throw(  ) SAL_OVERRIDE;
-            virtual sal_Int32       impl_getMaxStatements_throw(  ) SAL_OVERRIDE;
-            virtual sal_Int32       impl_getMaxTablesInSelect_throw(  ) SAL_OVERRIDE;
-            virtual sal_Bool        impl_storesMixedCaseQuotedIdentifiers_throw(  ) SAL_OVERRIDE;
+            virtual OUString    impl_getIdentifierQuoteString_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_isCatalogAtStart_throw(  ) SAL_OVERRIDE;
+            virtual OUString    impl_getCatalogSeparator_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_supportsCatalogsInTableDefinitions_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_supportsSchemasInTableDefinitions_throw(  ) SAL_OVERRIDE ;
+            virtual bool        impl_supportsCatalogsInDataManipulation_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_supportsSchemasInDataManipulation_throw(  ) SAL_OVERRIDE ;
+            virtual bool        impl_supportsMixedCaseQuotedIdentifiers_throw(  ) SAL_OVERRIDE ;
+            virtual bool        impl_supportsAlterTableWithAddColumn_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_supportsAlterTableWithDropColumn_throw(  ) SAL_OVERRIDE;
+            virtual sal_Int32   impl_getMaxStatements_throw(  ) SAL_OVERRIDE;
+            virtual sal_Int32   impl_getMaxTablesInSelect_throw(  ) SAL_OVERRIDE;
+            virtual bool        impl_storesMixedCaseQuotedIdentifiers_throw(  ) SAL_OVERRIDE;
         protected:
             OUString getURLImpl();
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE;
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 48b618c6ba8b..c76e81bb0a1c 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -75,8 +75,8 @@ namespace connectivity
             sal_Int32                                   m_nRowPos;
             sal_Int32                                   m_nDriverColumnCount;   // column count of the driver which can sometimes be less than the metadata count
             SQLRETURN                                   m_nCurrentFetchState;
-            sal_Bool                                    m_bWasNull;
-            sal_Bool                                    m_bEOF;                 // after last record
+            bool                                        m_bWasNull;
+            bool                                        m_bEOF;                 // after last record
 
             // set the columncount of the driver
             void checkColumnCount();
@@ -209,7 +209,7 @@ namespace connectivity
             void openVersionColumns(const ::com::sun::star::uno::Any& catalog, const OUString& schema,
                                                             const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void openBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema,
-                                                                    const OUString& table,sal_Int32 scope,sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+                                                                    const OUString& table,sal_Int32 scope, bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void openForeignKeys( const ::com::sun::star::uno::Any& catalog, const OUString* schema,const OUString* table,
                                                               const ::com::sun::star::uno::Any& catalog2, const OUString* schema2,const OUString* table2)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void openExportedKeys(const ::com::sun::star::uno::Any& catalog, const OUString& schema,const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -217,10 +217,10 @@ namespace connectivity
             void openPrimaryKeys(const ::com::sun::star::uno::Any& catalog, const OUString& schema,const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void openTablePrivileges(const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern,
                                                               const OUString& tableNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openSpecialColumns(sal_Bool _bRowVer,const ::com::sun::star::uno::Any& catalog, const OUString& schema,
-                                                                    const OUString& table,sal_Int32 scope,   sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            void openSpecialColumns(bool _bRowVer,const ::com::sun::star::uno::Any& catalog, const OUString& schema,
+                                                                    const OUString& table,sal_Int32 scope,   bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void openIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema,
-                                                    const OUString& table,sal_Bool unique,sal_Bool approximate )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+                                                    const OUString& table,bool unique,bool approximate )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
         protected:
             using OPropertySetHelper::getFastPropertyValue;
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index c6424f685069..23fe63e588b9 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -28,7 +28,7 @@ namespace connectivity
 {
 
 //  sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True);
-sal_Bool LoadLibrary_ODBC3(OUString &_rPath);
+bool LoadLibrary_ODBC3(OUString &_rPath);
 //  sal_Bool LoadLibrary_ADABAS(OUString &_rPath);
 
     // Connecting to a data source
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 50460eed8e02..5be9ad902e1a 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -69,7 +69,7 @@ namespace connectivity
                             // Array of bound parameter objects. Each parameter marker will have a
                             // corresponding object to hold bind information, and resulting data.
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >  m_xMetaData;
-            sal_Bool                                                                        m_bPrepared;
+            bool                                                                        m_bPrepared;
 
             void FreeParams();
             void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException);
@@ -86,7 +86,7 @@ namespace connectivity
             void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData);
             void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data);
 
-            sal_Bool isPrepared() const { return m_bPrepared;}
+            bool isPrepared() const { return m_bPrepared;}
             void prepareStatement();
             void checkParameterIndex(sal_Int32 _parameterIndex);
 
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index fb176dc7f301..69b78debee0e 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -130,7 +130,7 @@ namespace connectivity
             // Else, we read and cache all columns whose number is <= a requested column.
             // m_aRow[colNumber].getBound() says if it contains an up-to-date value or not.
             TDataRow                                    m_aRow;
-            sal_Bool                                    m_bFetchDataInOrder;
+            bool                                    m_bFetchDataInOrder;
             SQLHANDLE                                   m_aStatementHandle;
             SQLHANDLE                                   m_aConnectionHandle;
             OStatement_Base*                            m_pStatement;
@@ -142,16 +142,16 @@ namespace connectivity
             sal_Int32                                   m_nRowPos;
             mutable sal_uInt32                          m_nUseBookmarks;
             SQLRETURN                                   m_nCurrentFetchState;
-            sal_Bool                                    m_bWasNull;
-            sal_Bool                                    m_bEOF;                 // after last record
-            sal_Bool                                    m_bLastRecord;
-            sal_Bool                                    m_bFreeHandle;
-            sal_Bool                                    m_bInserting;
-            sal_Bool                                    m_bRowInserted;
-            sal_Bool                                    m_bRowDeleted;
-            sal_Bool                                    m_bUseFetchScroll;
+            bool                                    m_bWasNull;
+            bool                                    m_bEOF;                 // after last record
+            bool                                    m_bLastRecord;
+            bool                                    m_bFreeHandle;
+            bool                                    m_bInserting;
+            bool                                    m_bRowInserted;
+            bool                                    m_bRowDeleted;
+            bool                                    m_bUseFetchScroll;
 
-            sal_Bool  isBookmarkable()          const;
+            bool      isBookmarkable()          const;
             sal_Int32 getResultSetConcurrency() const;
             sal_Int32 getResultSetType()        const;
             sal_Int32 getFetchDirection()       const;
@@ -171,9 +171,9 @@ namespace connectivity
             void releaseBuffer();
             void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             void fillNeededData(SQLRETURN _nRet);
-            sal_Bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData);
+            bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData);
             TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
-            SQLRETURN unbind(sal_Bool _bUnbindHandle = sal_True);
+            SQLRETURN unbind(bool _bUnbindHandle = true);
             SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex);
 
             // helper to implement XRow::getXXX in simple cases
@@ -182,7 +182,7 @@ namespace connectivity
             // for simple cases
             template < typename T > T impl_getValue( const sal_Int32 _nColumnIndex, SQLSMALLINT nType );
             // these cases need some special treatment
-            sal_Bool impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            bool impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::com::sun::star::uno::Sequence< sal_Int8 > impl_getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::com::sun::star::util::Date impl_getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::com::sun::star::util::Time impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -329,10 +329,10 @@ namespace connectivity
             virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
             // IResultSetHelper
-            virtual sal_Bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData) SAL_OVERRIDE;
+            virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) SAL_OVERRIDE;
             virtual sal_Int32 getDriverPos() const SAL_OVERRIDE;
-            virtual sal_Bool deletedVisible() const SAL_OVERRIDE;
-            virtual sal_Bool isRowDeleted() const SAL_OVERRIDE;
+            virtual bool deletedVisible() const SAL_OVERRIDE;
+            virtual bool isRowDeleted() const SAL_OVERRIDE;
 
         protected:
             using OPropertySetHelper::getFastPropertyValue;
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index fa08e6106664..bf8a86b77986 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -46,7 +46,7 @@ namespace connectivity
             SQLHANDLE       m_aStatementHandle;
             OConnection*    m_pConnection;
             sal_Int32       m_nColCount;
-            sal_Bool        m_bUseODBC2Types;
+            bool        m_bUseODBC2Types;
 
             OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -56,14 +56,14 @@ namespace connectivity
                 :m_aStatementHandle( _pStmt )
                 ,m_pConnection(_pConnection)
                 ,m_nColCount(-1)
-                ,m_bUseODBC2Types(sal_False)
+                ,m_bUseODBC2Types(false)
             {}
             OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping)
                     :m_vMapping(_vMapping)
                     ,m_aStatementHandle( _pStmt )
                     ,m_pConnection(_pConnection)
                     ,m_nColCount(_vMapping.size()-1)
-                    ,m_bUseODBC2Types(sal_False)
+                    ,m_bUseODBC2Types(false)
             {}
             virtual ~OResultSetMetaData();
 
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 97628b363b2e..ce3d94d5dc4a 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -86,8 +86,8 @@ namespace connectivity
             sal_Int32 getFetchDirection()       const;
             sal_Int32 getFetchSize()            const;
             OUString getCursorName()     const;
-            sal_Bool isUsingBookmarks()         const;
-            sal_Bool getEscapeProcessing()      const;
+            bool isUsingBookmarks()         const;
+            bool getEscapeProcessing()      const;
             template < typename T, SQLINTEGER BufferLength > T getStmtOption (SQLINTEGER fOption, T dflt = 0) const;
 
             void setQueryTimeOut(sal_Int64 _par0)           ;
@@ -96,7 +96,7 @@ namespace connectivity
             void setFetchDirection(sal_Int32 _par0)         ;
             void setFetchSize(sal_Int32 _par0)              ;
             void setCursorName(const OUString &_par0);
-            void setEscapeProcessing( const sal_Bool _bEscapeProc );
+            void setEscapeProcessing( const bool _bEscapeProc );
             template < typename T, SQLINTEGER BufferLength > SQLRETURN setStmtOption (SQLINTEGER fOption, T value) const;
 
             virtual void setResultSetConcurrency(sal_Int32 _par0)   ;
@@ -106,7 +106,7 @@ namespace connectivity
             void reset () throw( ::com::sun::star::sdbc::SQLException);
             void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
             void setWarning (const  ::com::sun::star::sdbc::SQLWarning &ex) throw( ::com::sun::star::sdbc::SQLException);
-            sal_Bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException);
+            bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException);
             sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException);
 
 
@@ -114,7 +114,7 @@ namespace connectivity
             // getResultSet returns the current result as a ResultSet.  It
             // returns NULL if the current result is not a ResultSet.
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getResultSet (sal_Bool checkCount) throw( ::com::sun::star::sdbc::SQLException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getResultSet (bool checkCount) throw( ::com::sun::star::sdbc::SQLException);
             /**
                 creates the driver specific resultset (factory)
             */
@@ -194,7 +194,7 @@ namespace connectivity
 
                 @return the cursor properties
             */
-            SQLUINTEGER getCursorProperties(SQLINTEGER _nCursorType,sal_Bool bFirst);
+            SQLUINTEGER getCursorProperties(SQLINTEGER _nCursorType, bool bFirst);
 
         protected:
             using OPropertySetHelper::getFastPropertyValue;
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 780a6eafdb2a..312713261719 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -101,7 +101,7 @@ namespace connectivity
                                         SQLHANDLE _pContext,
                                         SQLSMALLINT _nHandleType,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                        sal_Bool _bNoFound=sal_True,
+                                        bool _bNoFound=true,
                                         rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252)
                                         throw(::com::sun::star::sdbc::SQLException);
 
@@ -134,7 +134,7 @@ namespace connectivity
             static void GetInfo(OConnection* _pConnection,
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
-                                sal_Bool &_rValue,
+                                bool &_rValue,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             static sal_Int32 MapOdbcType2Jdbc(SQLSMALLINT _nType);
@@ -176,8 +176,8 @@ namespace connectivity
                 @param  fCType              the C type for the ODBC type
                 @param  fSqlType            the SQL type for the ODBC type
             */
-            static void getBindTypes(sal_Bool _bUseWChar,
-                                     sal_Bool _bUseOldTimeDate,
+            static void getBindTypes(bool _bUseWChar,
+                                     bool _bUseOldTimeDate,
                                      SQLSMALLINT _nOdbcType,
                                      SQLSMALLINT& fCType,
                                      SQLSMALLINT& fSqlType);
@@ -186,7 +186,7 @@ namespace connectivity
                                                     SQLHANDLE _aStatementHandle,
                                                     sal_Int32 columnIndex,
                                                     SQLSMALLINT _fSqlType,
-                                                    sal_Bool &_bWasNull,
+                                                    bool &_bWasNull,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                                     rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
@@ -194,13 +194,13 @@ namespace connectivity
                                                                             SQLHANDLE _aStatementHandle,
                                                                             sal_Int32 columnIndex,
                                                                             SQLSMALLINT _fSqlType,
-                                                                            sal_Bool &_bWasNull,
+                                                                            bool &_bWasNull,
                                                                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             static void getValue(   OConnection* _pConnection,
                                     SQLHANDLE _aStatementHandle,
                                     sal_Int32 columnIndex,
                                     SQLSMALLINT _nType,
-                                    sal_Bool &_bWasNull,
+                                    bool &_bWasNull,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                     void* _pValue,
                                     SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -215,14 +215,14 @@ namespace connectivity
                                     SQLLEN *pLen,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                     rtl_TextEncoding _nTextEncoding,
-                                    sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+                                    bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
 
         template <class T> void getValue(   OConnection* _pConnection,
                                             SQLHANDLE _aStatementHandle,
                                             sal_Int32 columnIndex,
                                             SQLSMALLINT _nType,
-                                            sal_Bool &_bWasNull,
+                                            bool &_bWasNull,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                                             T& _rValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
         {