mysqlc: sal_Bool -> bool

Change-Id: Ie479e1671b03fbb958886d4c01ecff41b2ad1d23

mysqlc/source/mysqlc_connection.cxx

@@ -67,9 +67,9 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
     ,m_xMetaData(NULL)
     ,m_rDriver(_rDriver)
     ,cppDriver(_cppDriver)
-    ,m_bClosed(sal_False)
-    ,m_bUseCatalog(sal_False)
-    ,m_bUseOldDateFormat(sal_False)
+    ,m_bClosed(false)
+    ,m_bUseCatalog(false)
+    ,m_bUseOldDateFormat(false)
 {
     OSL_TRACE("OConnection::OConnection");
     m_rDriver.acquire();
@@ -106,7 +106,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
     MutexGuard aGuard(m_aMutex);
 
     sal_Int32 nIndex;
-    sal_Bool  bEmbedded = sal_False;
+    bool  bEmbedded = false;
     OUString token;
     OUString aHostName("localhost");
     sal_Int32 nPort = 3306;
@@ -121,7 +121,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
     if (url.startsWith(MYSQLC_URI_PREFIX)) {
         nIndex = 12;
     } else {
-        bEmbedded = sal_True;
+        bEmbedded = true;
         nIndex = 20;
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OConnection::construct (embedded MySQL)", *this);
     }
@@ -169,7 +169,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
         }
     }
 
-    if (bEmbedded == sal_False) {
+    if (!bEmbedded) {
         try {
             sql::ConnectOptionsMap connProps;
             std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr();
@@ -348,7 +348,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-    sal_Bool autoCommit = sal_False;
+    bool autoCommit = false;
     try {
         autoCommit = m_settings.cppConnection->getAutoCommit() == true ? sal_True : sal_False;
     } catch (const sql::SQLException & e) {
@@ -651,7 +651,7 @@ void OConnection::disposing()
     }
     m_aStatements.clear();
 
-    m_bClosed   = sal_True;
+    m_bClosed   = true;
     m_xMetaData = WeakReference< XDatabaseMetaData >();
 
     dispose_ChildImpl();

mysqlc/source/mysqlc_connection.hxx

@@ -77,7 +77,7 @@ namespace connectivity
             OUString schema;
             OUString quoteIdentifier;
             OUString connectionURL;
-            sal_Bool readOnly;
+            bool readOnly;
         };
 
         class MysqlCDriver;
@@ -115,9 +115,9 @@ namespace connectivity
             MysqlCDriver&   m_rDriver;      // Pointer to the owning driver object
             sql::Driver*    cppDriver;
 
-            sal_Bool    m_bClosed;
-            sal_Bool    m_bUseCatalog;  // should we use the catalog on filebased databases
-            sal_Bool    m_bUseOldDateFormat;
+            bool    m_bClosed;
+            bool    m_bUseCatalog;  // should we use the catalog on filebased databases
+            bool    m_bUseOldDateFormat;
 
 
             void        buildTypeInfo() throw(SQLException);
@@ -227,7 +227,7 @@ namespace connectivity
             OUString transFormPreparedStatement(const OUString& _sSQL);
 
             // should we use the catalog on filebased databases
-            inline sal_Bool             isCatalogUsed()     const { return m_bUseCatalog; }
+            inline bool             isCatalogUsed()     const { return m_bUseCatalog; }
             inline OUString             getUserName()       const { return m_sUser; }
             inline const MysqlCDriver&  getDriver()         const { return m_rDriver;}
             inline rtl_TextEncoding     getTextEncoding()   const { return m_settings.encoding; }

mysqlc/source/mysqlc_databasemetadata.cxx

@@ -81,7 +81,7 @@ void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nTy
 /* {{{ ODatabaseMetaData::ODatabaseMetaData() -I- */
 ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon)
     :m_rConnection(_rCon)
-    ,m_bUseCatalog(sal_True)
+    ,m_bUseCatalog(true)
     ,meta(_rCon.getConnectionSettings().cppConnection->getMetaData())
     ,identifier_quote_string_set(false)
 {
@@ -200,10 +200,10 @@ sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName,
 
 
 /* {{{ ODatabaseMetaData::impl_getBoolMetaData() -I- */
-sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() )
+bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() )
 {
     OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
-    sal_Bool boolMetaData(0);
+    bool boolMetaData(false);
     try {
         boolMetaData = (meta->*_Method)() ? sal_True : sal_False;
     } catch (const sql::MethodNotImplementedException &) {
@@ -219,10 +219,10 @@ sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bo
 
 
 /* {{{ ODatabaseMetaData::impl_getBoolMetaData() -I- */
-sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg )
+bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg )
 {
     OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
-    sal_Bool boolMetaData(0);
+    bool boolMetaData(false);
     try {
         boolMetaData = (meta->*_Method)( _arg ) ? sal_True : sal_False;
     } catch (const sql::MethodNotImplementedException &) {
@@ -238,7 +238,7 @@ sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bo
 
 
 /* {{{ ODatabaseMetaData::impl_getRSTypeMetaData() -I- */
-sal_Bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType )
+bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType )
 {
     int resultSetType(sql::ResultSet::TYPE_FORWARD_ONLY);
     switch ( _resultSetType ) {

mysqlc/source/mysqlc_databasemetadata.hxx

@@ -45,7 +45,7 @@ namespace connectivity
         class ODatabaseMetaData : public ODatabaseMetaData_BASE
         {
             OConnection&    m_rConnection;
-            sal_Bool        m_bUseCatalog;
+            bool        m_bUseCatalog;
         protected:
             sql::DatabaseMetaData * meta;
             OUString        identifier_quote_string;
@@ -57,9 +57,9 @@ namespace connectivity
             OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() );
             OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() );
             sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() );
-            sal_Bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() );
-            sal_Bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg );
-            sal_Bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType );
+            bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() );
+            bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg );
+            bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType );
 
         public:
             inline const OConnection& getOwnConnection() const { return m_rConnection; }

mysqlc/source/mysqlc_driver.cxx

@@ -342,7 +342,7 @@ void release(oslInterlockedCount& _refCount,
 /* }}} */
 
 /* {{{ connectivity::mysqlc::checkDisposed() -I- */
-void checkDisposed(sal_Bool _bThrow)
+void checkDisposed(bool _bThrow)
     throw (DisposedException)
 {
     if (_bThrow) {

mysqlc/source/mysqlc_preparedstatement.cxx

@@ -204,7 +204,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
 
-    sal_Bool success = sal_False;
+    bool success = false;
     try {
         success = ((sql::PreparedStatement *)cppStatement)->execute()? sal_True:sal_False;
     } catch (const sql::SQLException &e) {

mysqlc/source/mysqlc_services.cxx

@@ -55,7 +55,7 @@ struct ProviderRequest
     }
 
     /* {{{ CREATE_PROVIDER -I- */
-    inline sal_Bool CREATE_PROVIDER(
+    inline bool CREATE_PROVIDER(
                 const OUString& Implname,
                 const Sequence< OUString > & Services,
                 ::cppu::ComponentInstantiation Factory,

mysqlc/source/mysqlc_statement.cxx

@@ -179,7 +179,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
     checkDisposed(rBHelper.bDisposed);
     const OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
 
-    sal_Bool success = false;
+    bool success = false;
     try {
         success = cppStatement->execute(OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False;
     } catch (const sql::SQLException &e) {
@@ -401,7 +401,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
     throw (IllegalArgumentException)
 {
     OSL_TRACE("OCommonStatement::convertFastPropertyValue");
-    sal_Bool bConverted = sal_False;
+    bool bConverted = false;
     // here we have to try to convert
     return bConverted;
 }

mysqlc/source/mysqlc_subcomponent.hxx

@@ -55,7 +55,7 @@ namespace connectivity
                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                      ::com::sun::star::lang::XComponent* _pObject);
 
-        void checkDisposed(sal_Bool _bThrow) throw (::com::sun::star::lang::DisposedException);
+        void checkDisposed(bool _bThrow) throw (::com::sun::star::lang::DisposedException);
 
         template <class SELF, class WEAK> class OSubComponent
         {

mysqlc/source/mysqlc_types.hxx

@@ -28,11 +28,11 @@ struct TypeInfoDef {
     const char *literalSuffix;
     const char *createParams;
     sal_Int16 nullable;
-    sal_Bool caseSensitive;
+    bool caseSensitive;
     sal_Int16 searchable;
-    sal_Bool isUnsigned;
-    sal_Bool fixedPrecScale;
-    sal_Bool autoIncrement;
+    bool isUnsigned;
+    bool fixedPrecScale;
+    bool autoIncrement;
     const char *localTypeName;
     sal_Int32 minScale;
     sal_Int32 maxScale;