diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-16 09:14:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-16 11:51:51 +0200 |
| commit | 199d333f131474729a105afa5a3da61205f61df2 (patch) | |
| tree | 01c0270df697b8857af0ad52fd8bd4502ccf86a0 /connectivity/source/inc | |
| parent | 2f316b07a502b527876462d524061dbf6c9a04d5 (diff) | |
connectivity: sal_Bool->bool
Change-Id: I96371121ce6697f153f4e973e65831ea2265eb56
Diffstat (limited to 'connectivity/source/inc')
53 files changed, 386 insertions, 385 deletions
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index b97558b1a82f..60ad96e49872 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -27,15 +27,15 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OAutoRetrievingBase { OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values - sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values + bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values protected: - OAutoRetrievingBase() : m_bAutoRetrievingEnabled(sal_False) {} + OAutoRetrievingBase() : m_bAutoRetrievingEnabled(false) {} virtual ~OAutoRetrievingBase(){} - inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } + inline void enableAutoRetrievingEnabled(bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } inline void setAutoRetrievingStatement(const OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: - inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } + inline bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } inline const OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } /** transform the statement to query for auto generated values diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index a964301f22b4..c0dbdefd6fb6 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -128,8 +128,8 @@ namespace connectivity protected: ORows m_aRows; ORows::iterator m_aRowsIter; - sal_Bool m_bBOF; - sal_Bool m_bEOF; + bool m_bBOF; + bool m_bEOF; virtual const ORowSetValue& getValue(sal_Int32 columnIndex); diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 6a68e8aa6d9b..ac7542a13bb3 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -42,14 +42,14 @@ namespace connectivity sal_Int32 m_Scale; sal_Int32 m_ColumnType; - sal_Bool m_AutoIncrement; - sal_Bool m_CaseSensitive; - sal_Bool m_Searchable; - sal_Bool m_Currency; - sal_Bool m_Signed; - sal_Bool m_ReadOnly; - sal_Bool m_Writable; - sal_Bool m_DefinitelyWritable; + bool m_AutoIncrement; + bool m_CaseSensitive; + bool m_Searchable; + bool m_Currency; + bool m_Signed; + bool m_ReadOnly; + bool m_Writable; + bool m_DefinitelyWritable; public: OColumn() @@ -59,14 +59,14 @@ namespace connectivity , m_Scale(0) , m_ColumnType(0) - , m_AutoIncrement(sal_False) - , m_CaseSensitive(sal_False) - , m_Searchable(sal_True) - , m_Currency(sal_False) - , m_Signed(sal_False) - , m_ReadOnly(sal_True) - , m_Writable(sal_False) - , m_DefinitelyWritable(sal_False) + , m_AutoIncrement(false) + , m_CaseSensitive(false) + , m_Searchable(true) + , m_Currency(false) + , m_Signed(false) + , m_ReadOnly(true) + , m_Writable(false) + , m_DefinitelyWritable(false) {} OColumn(const OUString &_aTableName, @@ -78,14 +78,14 @@ namespace connectivity sal_Int32 _aScale=0, sal_Int32 _aColumnType=0, - sal_Bool _aAutoIncrement=sal_False, - sal_Bool _aCaseSensitive=sal_False, - sal_Bool _aSearchable=sal_True, - sal_Bool _aCurrency=sal_False, - sal_Bool _aSigned=sal_False, - sal_Bool _aReadOnly=sal_True, - sal_Bool _aWritable=sal_False, - sal_Bool _aDefinitelyWritable=sal_False, + bool _aAutoIncrement=false, + bool _aCaseSensitive=false, + bool _aSearchable=true, + bool _aCurrency=false, + bool _aSigned=false, + bool _aReadOnly=true, + bool _aWritable=false, + bool _aDefinitelyWritable=false, const OUString &_aColumnLabel = OUString(), const OUString &_aColumnTypeName = OUString(), @@ -124,14 +124,14 @@ namespace connectivity inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) { } - sal_Bool isAutoIncrement() const { return m_AutoIncrement; } - sal_Bool isCaseSensitive() const { return m_CaseSensitive; } - sal_Bool isSearchable() const { return m_Searchable; } - sal_Bool isCurrency() const { return m_Currency; } - sal_Bool isSigned() const { return m_Signed; } - sal_Bool isReadOnly() const { return m_ReadOnly; } - sal_Bool isWritable() const { return m_Writable; } - sal_Bool isDefinitelyWritable() const { return m_DefinitelyWritable; } + bool isAutoIncrement() const { return m_AutoIncrement; } + bool isCaseSensitive() const { return m_CaseSensitive; } + bool isSearchable() const { return m_Searchable; } + bool isCurrency() const { return m_Currency; } + bool isSigned() const { return m_Signed; } + bool isReadOnly() const { return m_ReadOnly; } + bool isWritable() const { return m_Writable; } + bool isDefinitelyWritable() const { return m_DefinitelyWritable; } sal_Int32 isNullable() const { return m_Nullable; } sal_Int32 getColumnDisplaySize() const { return m_ColumnDisplaySize; } diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index ae2931833c6a..7d4d3cedaa73 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -43,11 +43,11 @@ namespace connectivity sal_Int16 nSearchType; // Can we search for the type? sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 - sal_Bool bCurrency : 1; // Currency - sal_Bool bAutoIncrement : 1; // Is it an autoincrementing field? - sal_Bool bNullable : 1; // Can the field be NULL? - sal_Bool bCaseSensitive : 1; // Is the type case sensitive? - sal_Bool bUnsigned : 1; // Is the type unsigned? + bool bCurrency : 1; // Currency + bool bAutoIncrement : 1; // Is it an autoincrementing field? + bool bNullable : 1; // Can the field be NULL? + bool bCaseSensitive : 1; // Is the type case sensitive? + bool bUnsigned : 1; // Is the type unsigned? OTypeInfo() :nPrecision(0) @@ -55,11 +55,11 @@ namespace connectivity ,nMinimumScale(0) ,nType( ::com::sun::star::sdbc::DataType::OTHER) ,nSearchType( ::com::sun::star::sdbc::ColumnSearch::FULL) - ,bCurrency(sal_False) - ,bAutoIncrement(sal_False) - ,bNullable(sal_True) - ,bCaseSensitive(sal_False) - ,bUnsigned(sal_False) + ,bCurrency(false) + ,bAutoIncrement(false) + ,bNullable(true) + ,bCaseSensitive(false) + ,bUnsigned(false) {} inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) @@ -71,8 +71,8 @@ namespace connectivity inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(()) { } - sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } - sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } + bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } + bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } inline OUString getDBName() const { return aTypeName; } }; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 00b29b5480fb..af0b2a94fee5 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -41,19 +41,19 @@ namespace connectivity ::connectivity::ODatabaseMetaDataResultSet::ORows m_aTypeInfoRows; // cached database information - ::std::pair<bool,sal_Bool> m_isCatalogAtStart; - ::std::pair<bool,OUString> m_sCatalogSeparator; - ::std::pair<bool,OUString> m_sIdentifierQuoteString; - ::std::pair<bool,sal_Bool> m_supportsCatalogsInTableDefinitions; - ::std::pair<bool,sal_Bool> m_supportsSchemasInTableDefinitions; - ::std::pair<bool,sal_Bool> m_supportsCatalogsInDataManipulation; - ::std::pair<bool,sal_Bool> m_supportsSchemasInDataManipulation; - ::std::pair<bool,sal_Bool> m_supportsMixedCaseQuotedIdentifiers; - ::std::pair<bool,sal_Bool> m_supportsAlterTableWithAddColumn; - ::std::pair<bool,sal_Bool> m_supportsAlterTableWithDropColumn; + ::std::pair<bool,bool> m_isCatalogAtStart; + ::std::pair<bool,OUString> m_sCatalogSeparator; + ::std::pair<bool,OUString> m_sIdentifierQuoteString; + ::std::pair<bool,bool> m_supportsCatalogsInTableDefinitions; + ::std::pair<bool,bool> m_supportsSchemasInTableDefinitions; + ::std::pair<bool,bool> m_supportsCatalogsInDataManipulation; + ::std::pair<bool,bool> m_supportsSchemasInDataManipulation; + ::std::pair<bool,bool> m_supportsMixedCaseQuotedIdentifiers; + ::std::pair<bool,bool> m_supportsAlterTableWithAddColumn; + ::std::pair<bool,bool> m_supportsAlterTableWithDropColumn; ::std::pair<bool,sal_Int32> m_MaxStatements; ::std::pair<bool,sal_Int32> m_MaxTablesInSelect; - ::std::pair<bool,sal_Bool> m_storesMixedCaseQuotedIdentifiers; + ::std::pair<bool,bool> m_storesMixedCaseQuotedIdentifiers; template <typename T> T callImplMethod(::std::pair<bool,T>& _rCache,const ::std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod) { @@ -74,19 +74,19 @@ namespace connectivity protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() = 0; // cached database information - virtual OUString impl_getIdentifierQuoteString_throw( ) = 0; - virtual sal_Bool impl_isCatalogAtStart_throw( ) = 0; - virtual OUString impl_getCatalogSeparator_throw( ) = 0; - virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ) = 0; - virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) = 0; - virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ) = 0; - virtual sal_Bool impl_supportsSchemasInDataManipulation_throw( ) = 0; - virtual sal_Bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) = 0; - virtual sal_Bool impl_supportsAlterTableWithAddColumn_throw( ) = 0; - virtual sal_Bool impl_supportsAlterTableWithDropColumn_throw( ) = 0; - virtual sal_Int32 impl_getMaxStatements_throw( ) = 0; - virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) = 0; - virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ) = 0; + virtual OUString impl_getIdentifierQuoteString_throw( ) = 0; + virtual bool impl_isCatalogAtStart_throw( ) = 0; + virtual OUString impl_getCatalogSeparator_throw( ) = 0; + virtual bool impl_supportsCatalogsInTableDefinitions_throw( ) = 0; + virtual bool impl_supportsSchemasInTableDefinitions_throw( ) = 0; + virtual bool impl_supportsCatalogsInDataManipulation_throw( ) = 0; + virtual bool impl_supportsSchemasInDataManipulation_throw( ) = 0; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) = 0; + virtual bool impl_supportsAlterTableWithAddColumn_throw( ) = 0; + virtual bool impl_supportsAlterTableWithDropColumn_throw( ) = 0; + virtual sal_Int32 impl_getMaxStatements_throw( ) = 0; + virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) = 0; + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) = 0; public: diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index 41c23210aea0..d76c16082528 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -30,7 +30,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - sal_Bool m_bResetValues; + bool m_bResetValues; protected: virtual const ORowSetValue& getValue(sal_Int32 columnIndex) SAL_OVERRIDE; public: diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 6fa5874348d4..a1f68813e13f 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.hxx @@ -39,10 +39,10 @@ namespace connectivity BOOKMARK }; public: - virtual sal_Bool move(Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData) = 0; + virtual bool move(Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) = 0; virtual sal_Int32 getDriverPos() const = 0; - virtual sal_Bool deletedVisible() const = 0; - virtual sal_Bool isRowDeleted() const = 0; + virtual bool deletedVisible() const = 0; + virtual bool isRowDeleted() const = 0; protected: ~IResultSetHelper() {} diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 833216b9ae92..7b58ef40e7dc 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -36,7 +36,7 @@ namespace connectivity IResultSetHelper* m_pHelper; // used for moving in the resultset bool m_bDeletedVisible; - sal_Bool moveAbsolute(sal_Int32 _nOffset,sal_Bool _bRetrieveData); + bool moveAbsolute(sal_Int32 _nOffset,bool _bRetrieveData); public: OSkipDeletedSet(IResultSetHelper* _pHelper); ~OSkipDeletedSet(); @@ -60,7 +60,7 @@ namespace connectivity @return true when the movement was successful otherwise false */ - sal_Bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData); + bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData); /** clear the map and the vector used in this class */ diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 83dda81b9678..c70654a7fca4 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -54,7 +54,7 @@ namespace connectivity TIntValuePairVector m_aKeyValues; TKeyTypeVector m_aKeyType; ::std::vector<TAscendingOrder> m_aAscending; - sal_Bool m_bFrozen; + bool m_bFrozen; public: @@ -95,7 +95,7 @@ namespace connectivity // look at the name - sal_Bool IsFrozen() const { return m_bFrozen; } + bool IsFrozen() const { return m_bFrozen; } // returns the current size of the keyvalues size_t Count() const { return m_aKeyValues.size(); } @@ -110,17 +110,17 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OKeySet : public ORefVector<sal_Int32> { - sal_Bool m_bFrozen; + bool m_bFrozen; public: OKeySet() : ORefVector<sal_Int32>() - , m_bFrozen(sal_False){} + , m_bFrozen(false){} OKeySet(Vector::size_type _nSize) : ORefVector<sal_Int32>(_nSize) - , m_bFrozen(sal_False){} + , m_bFrozen(false){} - sal_Bool isFrozen() const { return m_bFrozen; } - void setFrozen(sal_Bool _bFrozen=sal_True) { m_bFrozen = _bFrozen; } + bool isFrozen() const { return m_bFrozen; } + void setFrozen(bool _bFrozen=true) { m_bFrozen = _bFrozen; } }; } #endif // CONNECTIVITY_TSORTINDEX_HXX diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index f06e0975b40f..89a9d04ace5b 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -59,19 +59,19 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual OUString impl_getIdentifierQuoteString_throw( ); - virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual OUString impl_getCatalogSeparator_throw( ); - virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); - virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; - virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); - virtual sal_Bool impl_supportsSchemasInDataManipulation_throw( ) ; - virtual sal_Bool impl_supportsMixedCaseQuotedIdentifiers_throw( ); - virtual sal_Bool impl_supportsAlterTableWithAddColumn_throw( ); - virtual sal_Bool impl_supportsAlterTableWithDropColumn_throw( ); - virtual sal_Int32 impl_getMaxStatements_throw( ); - virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); - virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); + virtual bool impl_isCatalogAtStart_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); + virtual bool impl_supportsCatalogsInTableDefinitions_throw( ); + virtual bool impl_supportsSchemasInTableDefinitions_throw( ) ; + virtual bool impl_supportsCatalogsInDataManipulation_throw( ); + virtual bool impl_supportsSchemasInDataManipulation_throw( ) ; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ); + virtual bool impl_supportsAlterTableWithAddColumn_throw( ); + virtual bool impl_supportsAlterTableWithDropColumn_throw( ); + virtual sal_Int32 impl_getMaxStatements_throw( ); + virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ); public: ODatabaseMetaData(OConnection* _pCon); diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 459d07fecc40..d40594f65e1d 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -126,6 +126,7 @@ namespace connectivity operator OUString() const; + operator bool() const { return getBool() == 1; } operator sal_Bool() const { return getBool(); } operator sal_Int8() const { return getInt8(); } operator sal_Int16() const { return getInt16(); } @@ -137,7 +138,7 @@ namespace connectivity operator ::com::sun::star::util::Date() const ; operator ::com::sun::star::util::Time() const ; operator ::com::sun::star::util::DateTime()const ; - OUString getString() const; + OUString getString() const; sal_Bool getBool() const; IUnknown* getIUnknown() const; IDispatch* getIDispatch() const; diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx index aaf60c27e78e..5db2b181ae20 100644 --- a/connectivity/source/inc/calc/CResultSet.hxx +++ b/connectivity/source/inc/calc/CResultSet.hxx @@ -40,13 +40,13 @@ namespace connectivity public OCalcResultSet_BASE, public OCalcResultSet_BASE3 { - sal_Bool m_bBookmarkable; + bool m_bBookmarkable; protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE; + virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE; public: DECLARE_SERVICE_INFO(); @@ -72,7 +72,7 @@ namespace connectivity // XDeleteRows 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; - virtual sal_Bool isRowDeleted() const SAL_OVERRIDE { return sal_False; } + virtual bool isRowDeleted() const SAL_OVERRIDE { return false; } }; } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 82f09391d381..8a2efdaf83ce 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -51,7 +51,7 @@ namespace connectivity sal_Int32 m_nStartRow; sal_Int32 m_nDataCols; sal_Int32 m_nDataRows; - sal_Bool m_bHasHeaders; + bool m_bHasHeaders; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > m_xFormats; ::Date m_aNullDate; @@ -73,8 +73,8 @@ namespace connectivity ); virtual sal_Int32 getCurrentLastPos() const SAL_OVERRIDE; - virtual sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; - virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) SAL_OVERRIDE; + virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; + virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx index c5bdcf11c416..5135a956572f 100644 --- a/connectivity/source/inc/dbase/DCode.hxx +++ b/connectivity/source/inc/dbase/DCode.hxx @@ -50,7 +50,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL); - virtual sal_Bool isIndexed() const SAL_OVERRIDE; + virtual bool isIndexed() const SAL_OVERRIDE; virtual file::OEvaluateSet* preProcess(file::OBoolOperator* pOp, file::OOperand* pRight = 0) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); }; diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx index 6ae8c1dacfc3..7c5a60ef3d8d 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx @@ -47,8 +47,8 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ) SAL_OVERRIDE; - virtual sal_Bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) SAL_OVERRIDE; + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) SAL_OVERRIDE; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) SAL_OVERRIDE; protected: virtual ~ODbaseDatabaseMetaData(); public: diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index ac4b9c6a89ea..833378cccf5c 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -81,7 +81,7 @@ namespace connectivity m_nRootPage; ODbaseTable* m_pTable; - sal_Bool m_bUseCollector : 1; // Use the Garbage Collector + bool m_bUseCollector : 1; // Use the Garbage Collector OUString getCompletePath(); void closeImpl(); @@ -93,7 +93,7 @@ namespace connectivity ODbaseIndex(ODbaseTable* _pTable); ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& _Name); - sal_Bool openIndexFile(); + bool openIndexFile(); virtual void refreshColumns() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel @@ -114,31 +114,31 @@ namespace connectivity sal_uInt32 GetRootPos() {return m_nRootPage;} sal_uInt32 GetPageCount() {return m_nPageCount;} - sal_Bool IsText() const {return m_aHeader.db_keytype == 0;} + bool IsText() const {return m_aHeader.db_keytype == 0;} sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;} - virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); - virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); - virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue); - virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue); + virtual bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); + virtual bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); + virtual bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue); + virtual bool Find(sal_uInt32 nRec, const ORowSetValue& rValue); void createINFEntry(); - sal_Bool CreateImpl(); - sal_Bool DropImpl(); + bool CreateImpl(); + bool DropImpl(); DECLARE_SERVICE_INFO(); protected: - ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False); + ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, bool bLoad = false); void Collect(ONDXPage*); ONDXPagePtr getRoot(); - sal_Bool isUnique() const { return m_IsUnique; } - sal_Bool UseCollector() const {return m_bUseCollector;} + bool isUnique() const { return m_IsUnique; } + bool UseCollector() const {return m_bUseCollector;} // Tree operations void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode); - void Release(sal_Bool bSave = sal_True); - sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue); + void Release(bool bSave = true); + bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue); }; SvStream& WriteODbaseIndex(SvStream &rStream, ODbaseIndex&); diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index ac9e1e5eb6fd..6c72c75a8c4b 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -42,11 +42,11 @@ namespace connectivity sal_uInt16 m_nCurNode; protected: - sal_uIntPtr Find(sal_Bool bFirst); - sal_uIntPtr GetCompare(sal_Bool bFirst); - sal_uIntPtr GetLike(sal_Bool bFirst); - sal_uIntPtr GetNull(sal_Bool bFirst); - sal_uIntPtr GetNotNull(sal_Bool bFirst); + sal_uIntPtr Find(bool bFirst); + sal_uIntPtr GetCompare(bool bFirst); + sal_uIntPtr GetLike(bool bFirst); + sal_uIntPtr GetNull(bool bFirst); + sal_uIntPtr GetNotNull(bool bFirst); ONDXKey* GetFirstKey(ONDXPage* pPage, const file::OOperand& rKey); diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx index 43b067c59af8..3f167dface22 100644 --- a/connectivity/source/inc/dbase/DResultSet.hxx +++ b/connectivity/source/inc/dbase/DResultSet.hxx @@ -40,13 +40,13 @@ namespace connectivity public ODbaseResultSet_BASE, public ODbaseResultSet_BASE3 { - sal_Bool m_bBookmarkable; + bool m_bBookmarkable; protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE; + virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE; virtual file::OSQLAnalyzer* createAnalyzer(); public: DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 834bfec2c979..c0ad186ffa38 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -87,7 +87,7 @@ namespace connectivity DBFMemoHeader m_aMemoHeader; SvStream* m_pMemoStream; rtl_TextEncoding m_eEncoding; - sal_Bool m_bWriteableMemo; + bool m_bWriteableMemo; void alterColumn(sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor , @@ -96,15 +96,15 @@ namespace connectivity void fillColumns(); OUString createTempFile(); void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos); - sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo); - sal_Bool CreateMemoFile(const INetURLObject& aFile); - sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;} - sal_Bool ReadMemoHeader(); - sal_Bool ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable); - - sal_Bool WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr); - sal_Bool WriteBuffer(); - sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols, bool bForceAllFields); + bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo); + bool CreateMemoFile(const INetURLObject& aFile); + bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;} + bool ReadMemoHeader(); + bool ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable); + + bool WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr); + bool WriteBuffer(); + bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols, bool bForceAllFields); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos); void AllocBuffer(); @@ -133,8 +133,8 @@ namespace connectivity void construct() SAL_OVERRIDE; // can throw any exception virtual sal_Int32 getCurrentLastPos() const SAL_OVERRIDE; - virtual sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; - virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) SAL_OVERRIDE; + virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; + virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider @@ -150,19 +150,19 @@ namespace connectivity // XRename virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool DropImpl(); - sal_Bool CreateImpl(); + bool DropImpl(); + bool CreateImpl(); - virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) SAL_OVERRIDE; - virtual sal_Bool DeleteRow(const OSQLColumns& _rCols) SAL_OVERRIDE; - virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) SAL_OVERRIDE; + virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) SAL_OVERRIDE; + virtual bool DeleteRow(const OSQLColumns& _rCols) SAL_OVERRIDE; + virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) SAL_OVERRIDE; virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor) SAL_OVERRIDE; virtual void dropColumn(sal_Int32 _nPos) SAL_OVERRIDE; static OUString getEntry(file::OConnection* _pConnection,const OUString& _sURL ); - static sal_Bool Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); + static bool Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, sdbcx::OCollection* _pIndexes ); virtual void refreshHeader() SAL_OVERRIDE; diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index b00537a11f82..d79358b4f0af 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -64,17 +64,17 @@ namespace connectivity void setRecord(sal_uInt32 _nRec) { nRecord = _nRec; } void ResetRecord() { nRecord = 0; } - sal_Bool operator == (const ONDXKey& rKey) const; - sal_Bool operator != (const ONDXKey& rKey) const; - sal_Bool operator < (const ONDXKey& rKey) const; - sal_Bool operator <= (const ONDXKey& rKey) const; - sal_Bool operator > (const ONDXKey& rKey) const; - sal_Bool operator >= (const ONDXKey& rKey) const; + bool operator == (const ONDXKey& rKey) const; + bool operator != (const ONDXKey& rKey) const; + bool operator < (const ONDXKey& rKey) const; + bool operator <= (const ONDXKey& rKey) const; + bool operator > (const ONDXKey& rKey) const; + bool operator >= (const ONDXKey& rKey) const; - sal_Bool Load (SvFileStream& rStream, sal_Bool bText); - sal_Bool Write(SvFileStream& rStream, sal_Bool bText); + bool Load (SvFileStream& rStream, bool bText); + bool Write(SvFileStream& rStream, bool bText); - static sal_Bool IsText(sal_Int32 eType); + static bool IsText(sal_Int32 eType); private: int Compare(const ONDXKey& rKey) const; @@ -106,7 +106,7 @@ namespace connectivity ONDXPagePtr& operator=(ONDXPage* pPageRef); sal_uInt32 GetPagePos() const {return nPagePos;} - sal_Bool HasPage() const {return nPagePos != 0;} + bool HasPage() const {return nPagePos != 0;} // sal_Bool Is() const { return isValid(); } }; @@ -120,7 +120,7 @@ namespace connectivity friend SvStream& operator >> (SvStream &rStream, ONDXPage&); sal_uInt32 nPagePos; // Position in the index file - sal_Bool bModified : 1; + bool bModified : 1; sal_uInt16 nCount; ONDXPagePtr aParent, // Parent page @@ -132,13 +132,13 @@ namespace connectivity // Node operations sal_uInt16 Count() const {return nCount;} - sal_Bool Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); - sal_Bool Insert(sal_uInt16 nIndex, ONDXNode& rNode); - sal_Bool Append(ONDXNode& rNode); - sal_Bool Delete(sal_uInt16); + bool Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); + bool Insert(sal_uInt16 nIndex, ONDXNode& rNode); + bool Append(ONDXNode& rNode); + bool Delete(sal_uInt16); void Remove(sal_uInt16); - void Release(sal_Bool bSave = sal_True); - void ReleaseFull(sal_Bool bSave = sal_True); + void Release(bool bSave = true); + void ReleaseFull(bool bSave = true); // Split and merge ONDXNode Split(ONDXPage& rPage); @@ -148,13 +148,13 @@ namespace connectivity ONDXNode& operator[] (sal_uInt16 nPos); const ONDXNode& operator[] (sal_uInt16 nPos) const; - sal_Bool IsRoot() const; - sal_Bool IsLeaf() const; - sal_Bool IsModified() const; - sal_Bool HasParent(); - sal_Bool HasChild() const; + bool IsRoot() const; + bool IsLeaf() const; + bool IsModified() const; + bool HasParent(); + bool HasChild() const; - sal_Bool IsFull() const; + bool IsFull() const; sal_uInt32 GetPagePos() const {return nPagePos;} ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0); @@ -178,10 +178,10 @@ namespace connectivity virtual void QueryDelete() SAL_OVERRIDE; - void SetModified(sal_Bool bMod) {bModified = bMod;} + void SetModified(bool bMod) {bModified = bMod;} void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;} - sal_Bool Find(const ONDXKey&); // Descend recursively + bool Find(const ONDXKey&); // Descend recursively sal_uInt16 FindPos(const ONDXKey& rKey) const; #if OSL_DEBUG_LEVEL > 1 @@ -192,11 +192,11 @@ namespace connectivity SvStream& WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr&); SvStream& operator >> (SvStream &rStream, ONDXPagePtr&); - inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();} - inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();} - inline sal_Bool ONDXPage::IsModified() const {return bModified;} - inline sal_Bool ONDXPage::HasParent() {return aParent.Is();} - inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();} + inline bool ONDXPage::IsRoot() const {return !aParent.Is();} + inline bool ONDXPage::IsLeaf() const {return !aChild.HasPage();} + inline bool ONDXPage::IsModified() const {return bModified;} + inline bool ONDXPage::HasParent() {return aParent.Is();} + inline bool ONDXPage::HasChild() const {return aChild.HasPage();} inline ONDXPagePtr ONDXPage::GetParent() {return aParent;} inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr()) @@ -232,7 +232,7 @@ namespace connectivity :aChild(aPagePtr),aKey(rKey) {} // Does the node point to a page? - sal_Bool HasChild() const {return aChild.HasPage();} + bool HasChild() const {return aChild.HasPage();} // If an index is provided, we may be able to retrieve the page ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL); @@ -294,29 +294,29 @@ namespace connectivity return *this; } - inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const + inline bool ONDXKey::operator == (const ONDXKey& rKey) const { if(&rKey == this) - return sal_True; + return true; return Compare(rKey) == 0; } - inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const + inline bool ONDXKey::operator != (const ONDXKey& rKey) const { return !operator== (rKey); } - inline sal_Bool ONDXKey::operator < (const ONDXKey& rKey) const + inline bool ONDXKey::operator < (const ONDXKey& rKey) const { return Compare(rKey) < 0; } - inline sal_Bool ONDXKey::operator > (const ONDXKey& rKey) const + inline bool ONDXKey::operator > (const ONDXKey& rKey) const { return Compare(rKey) > 0; } - inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const + inline bool ONDXKey::operator <= (const ONDXKey& rKey) const { return !operator > (rKey); } - inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const + inline bool ONDXKey::operator >= (const ONDXKey& rKey) const { return !operator< (rKey); } diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 58dd3c03f2ea..a53c8423b586 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -62,12 +62,12 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > m_xDir; // directory ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - sal_Bool m_bClosed; - sal_Bool m_bAutoCommit; - sal_Bool m_bReadOnly; - sal_Bool m_bShowDeleted; - sal_Bool m_bCaseSensitiveExtension; - sal_Bool m_bCheckSQL92; + bool m_bClosed; + bool m_bAutoCommit; + bool m_bReadOnly; + bool m_bShowDeleted; + bool m_bCaseSensitiveExtension; + bool m_bCheckSQL92; bool m_bDefaultTextEncoding; @@ -128,13 +128,13 @@ namespace connectivity // create a catalog or return the catalog already created virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); - sal_Bool matchesExtension( const OUString& _rExt ) const; + bool matchesExtension( const OUString& _rExt ) const; inline const OUString& getExtension() const { return m_aFilenameExtension; } - inline sal_Bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } + inline bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } inline OFileDriver* getDriver() const { return m_pDriver; } - inline sal_Bool showDeleted() const { return m_bShowDeleted; } - inline sal_Bool isCheckEnabled() const { return m_bCheckSQL92; } + inline bool showDeleted() const { return m_bShowDeleted; } + inline bool isCheckEnabled() const { return m_bCheckSQL92; } inline bool isTextEncodingDefaulted() const { return m_bDefaultTextEncoding; } public: @@ -145,7 +145,7 @@ namespace connectivity GrantAccess() { } }; - void setCaseSensitiveExtension( sal_Bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } + void setCaseSensitiveExtension( bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } }; } } diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index 07f36bcd9a2a..27cdd86bc739 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx @@ -37,19 +37,19 @@ namespace connectivity { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE; // 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: OConnection* m_pConnection; // I need the native class not only the interface virtual ~ODatabaseMetaData(); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 9c99d4f1b22e..ed79248f47b0 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -121,31 +121,31 @@ namespace connectivity sal_Int32 m_nLastVisitedPos; sal_Int32 m_nRowCountResult; sal_Int32 m_nColumnCount; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bInserted; // true when moveToInsertRow was called + bool m_bWasNull; + bool m_bEOF; // after last record + bool m_bLastRecord; + bool m_bInserted; // true when moveToInsertRow was called // set to false when cursor moved or cancel - sal_Bool m_bRowUpdated; - sal_Bool m_bRowInserted; - sal_Bool m_bRowDeleted; - sal_Bool m_bShowDeleted; - sal_Bool m_bIsCount; + bool m_bRowUpdated; + bool m_bRowInserted; + bool m_bRowDeleted; + bool m_bShowDeleted; + bool m_bIsCount; void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount); void construct(); //sal_Bool evaluate(); - sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, + bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, sal_Int32 nOffset = 1, - sal_Bool bEvaluate = sal_True, - sal_Bool bRetrieveData = sal_True); + bool bEvaluate = true, + bool bRetrieveData = true); OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow); - sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] >= 0;} + bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] >= 0;} // return true when the select statement is "select count(*) from table" - inline sal_Bool isCount() const { return m_bIsCount; } + inline bool isCount() const { return m_bIsCount; } void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); const ORowSetValue& getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); @@ -157,8 +157,8 @@ namespace connectivity using OResultSet_BASE::rBHelper; - sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData); - virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex); + bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, bool bRetrieveData); + virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; @@ -270,7 +270,7 @@ namespace connectivity // special methods inline sal_Int32 mapColumn(sal_Int32 column); - virtual sal_Bool OpenImpl(); + virtual bool OpenImpl(); virtual void doTableSpecials(const OSQLTable& _xTable); inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } @@ -296,15 +296,15 @@ namespace connectivity const OValueRefRow& _rSelectRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xNames, - sal_Bool _bSetColumnMapping, + bool _bSetColumnMapping, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, ::std::vector<sal_Int32>& _rColMapping); // 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; }; inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index e84985c78fe6..a8d1e07b30e6 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -96,7 +96,7 @@ namespace connectivity sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; @@ -118,7 +118,7 @@ namespace connectivity void GetAssignValues(); void SetAssignValue(const OUString& aColumnName, const OUString& aValue, - sal_Bool bSetNull = sal_False, + bool bSetNull = false, sal_uInt32 nParameter=SQL_NO_PARAMETER); void ParseAssignValues( const ::std::vector< OUString>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex); diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index f087a1716029..d341703f0023 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -44,7 +44,7 @@ namespace connectivity sal_Int32 m_nFilePos; // current IResultSetHelper::Movement sal_uInt8* m_pBuffer; sal_uInt16 m_nBufferSize; // size of the ReadBuffer, if pBuffer != NULL - sal_Bool m_bWriteable; // svstream cann't say if we are writeable + bool m_bWriteable; // svstream cann't say if we are writeable // so we have to virtual void FileClose(); @@ -73,13 +73,13 @@ namespace connectivity OConnection* getConnection() const { return m_pConnection;} virtual sal_Int32 getCurrentLastPos() const {return -1;} - virtual sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) = 0; - virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0; + virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) = 0; + virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) = 0; ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;} - virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); - virtual sal_Bool DeleteRow(const OSQLColumns& _rCols); - virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); + virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); + virtual bool DeleteRow(const OSQLColumns& _rCols); + virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); // refresh the header of file based tables to see changes done by someone @@ -88,7 +88,7 @@ namespace connectivity OUString SAL_CALL getName() throw(std::exception) SAL_OVERRIDE { return m_Name; } OUString getSchema() { return m_SchemaName; } - sal_Bool isReadOnly() const { return !m_bWriteable; } + bool isReadOnly() const { return !m_bWriteable; } // m_pFileStream && !m_pFileStream->IsWritable(); } // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 3a9647ef260a..796c2d6b0ba3 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -38,8 +38,8 @@ namespace connectivity ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; OConnection* m_pConnection; - mutable sal_Bool m_bHasSelectionCode; - mutable sal_Bool m_bSelectionFirstTime; + mutable bool m_bHasSelectionCode; + mutable bool m_bSelectionFirstTime; void bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvaluateSetList& _rEvaluateSetList); @@ -71,9 +71,9 @@ namespace connectivity void dispose(); void start(OSQLParseNode* pSQLParseNode); - virtual sal_Bool hasRestriction() const; - virtual sal_Bool hasFunctions() const; - inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); } + virtual bool hasRestriction() const; + virtual bool hasFunctions() const; + inline bool evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const OFileColumns& rCols); virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 938ffc728284..842f4cf0eaa2 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -77,7 +77,7 @@ namespace connectivity virtual sal_Int32 getDBType() const {return m_eDBType;} virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); - inline sal_Bool isValid() const; + inline bool isValid() const; TYPEINFO_OVERRIDE(); }; @@ -108,7 +108,7 @@ namespace connectivity OOperandAttr(sal_uInt16 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); - virtual sal_Bool isIndexed() const; + virtual bool isIndexed() const; virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); }; @@ -171,7 +171,7 @@ namespace connectivity class OOperandResultBOOL : public OOperandResult { public: - OOperandResultBOOL(sal_Bool bResult) : OOperandResult(::com::sun::star::sdbc::DataType::BIT) + OOperandResultBOOL(bool bResult) : OOperandResult(::com::sun::star::sdbc::DataType::BIT) { m_aValue = bResult ? 1.0 : 0.0; m_aValue.setBound(true); @@ -215,7 +215,7 @@ namespace connectivity public: TYPEINFO_OVERRIDE(); virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_Bool operate(const OOperand*, const OOperand*) const; + virtual bool operate(const OOperand*, const OOperand*) const; }; class OOp_NOT : public OBoolOperator @@ -225,7 +225,7 @@ namespace connectivity protected: virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; }; @@ -235,7 +235,7 @@ namespace connectivity TYPEINFO_OVERRIDE(); protected: - virtual sal_Bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; }; class OOp_OR : public OBoolOperator @@ -243,7 +243,7 @@ namespace connectivity public: TYPEINFO_OVERRIDE(); protected: - virtual sal_Bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; }; class OOO_DLLPUBLIC_FILE OOp_ISNULL : public OBoolOperator @@ -253,14 +253,14 @@ namespace connectivity public: virtual void Exec(OCodeStack&) SAL_OVERRIDE; virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; - virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; }; class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL { public: TYPEINFO_OVERRIDE(); - virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; }; class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator @@ -273,7 +273,7 @@ namespace connectivity public: OOp_LIKE(const sal_Unicode cEsc = L'\0'):cEscape(cEsc){}; - virtual sal_Bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; }; class OOp_NOTLIKE : public OOp_LIKE @@ -283,7 +283,7 @@ namespace connectivity public: OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){}; - virtual sal_Bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; }; class OOO_DLLPUBLIC_FILE OOp_COMPARE : public OBoolOperator @@ -296,7 +296,7 @@ namespace connectivity :aPredicateType(aPType) {} inline sal_Int32 getPredicateType() const { return aPredicateType; } - virtual sal_Bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; + virtual bool operate(const OOperand*, const OOperand*) const SAL_OVERRIDE; }; // Numerical operators @@ -335,7 +335,7 @@ namespace connectivity virtual double operate(const double& fLeft,const double& fRight) const SAL_OVERRIDE; }; - inline sal_Bool OOperand::isValid() const + inline bool OOperand::isValid() const { return getValue().getDouble() != double(0.0); } diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 91cba8de82f1..1ad755422ad8 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -43,7 +43,7 @@ namespace connectivity OSQLAnalyzer* m_pAnalyzer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xIndexes; sal_Int32 m_nParamCounter; - sal_Bool m_bORCondition; + bool m_bORCondition; public: OPredicateCompiler(OSQLAnalyzer* pAnalyzer); @@ -63,9 +63,9 @@ namespace connectivity OOperand* execute(connectivity::OSQLParseNode* pPredicateNode); void Clean(); - sal_Bool isClean() const {return m_aCodeList.empty();} - sal_Bool hasCode() const {return !isClean();} - sal_Bool hasORCondition() const {return m_bORCondition;} + bool isClean() const {return m_aCodeList.empty();} + bool hasCode() const {return !isClean();} + bool hasORCondition() const {return m_bORCondition;} void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } const OFileColumns getOrigColumns() const { return m_orgColumns; } protected: @@ -89,10 +89,10 @@ namespace connectivity OPredicateInterpreter(const ::rtl::Reference<OPredicateCompiler>& rComp) : m_rCompiler(rComp){} virtual ~OPredicateInterpreter(); - sal_Bool evaluate(OCodeList& rCodeList); + bool evaluate(OCodeList& rCodeList); void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); - inline sal_Bool start() + inline bool start() { return evaluate(m_rCompiler->m_aCodeList); } diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index 6f20bac01cee..6b7fa29e9225 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.hxx @@ -31,7 +31,7 @@ namespace connectivity { private: sal_Int32 m_nMaxRowsToScan; - sal_Bool m_bHeaderLine; // column names in first row + bool m_bHeaderLine; // column names in first row sal_Unicode m_cFieldDelimiter; // look at the name sal_Unicode m_cStringDelimiter; sal_Unicode m_cDecimalDelimiter; @@ -43,7 +43,7 @@ namespace connectivity virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException) SAL_OVERRIDE; // own methods - inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } + inline bool isHeaderLine() const { return m_bHeaderLine; } inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx index bf48705eff67..a3b4cead88d7 100644 --- a/connectivity/source/inc/flat/EResultSet.hxx +++ b/connectivity/source/inc/flat/EResultSet.hxx @@ -39,7 +39,7 @@ namespace connectivity public OFlatResultSet_BASE, public OFlatResultSet_BASE3 { - sal_Bool m_bBookmarkable; + bool m_bBookmarkable; protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 97edc6994997..393369ab0735 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -57,7 +57,7 @@ namespace connectivity bool m_bNeedToReadLine; private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); - sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo); + bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo); bool readLine(sal_Int32 *pEndPos = NULL, sal_Int32 *pStartPos = NULL, bool nonEmpty = false); void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2, @@ -88,8 +88,8 @@ namespace connectivity void construct() SAL_OVERRIDE; // can throw any exception - virtual sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; - virtual sal_Bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, sal_Bool bIsTable, sal_Bool bRetrieveData) SAL_OVERRIDE; + virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) SAL_OVERRIDE; + virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bIsTable, bool bRetrieveData) SAL_OVERRIDE; virtual void refreshHeader() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index d2d0bb2a77c6..b98f429a366a 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -31,10 +31,10 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; public: OHSQLColumns( ::cppu::OWeakObject& _rParent - ,sal_Bool _bCase + ,bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector - ,sal_Bool _bUseHardRef = sal_True + ,bool _bUseHardRef = true ); }; @@ -51,7 +51,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: - OHSQLColumn(sal_Bool _bCase); + OHSQLColumn(bool _bCase); virtual void construct() SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index fc79fb112812..0b0fac3d0867 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -64,7 +64,7 @@ namespace connectivity // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool m_bInShutDownConnections; + bool m_bInShutDownConnections; /** load the driver we want to delegate. The <member>m_xDriver</member> may be <NULL/> if the driver could not be loaded. diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index e211daf59d05..2bb3cfbfe2ea 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -43,7 +43,7 @@ namespace connectivity { namespace hsqldb public: HView( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - sal_Bool _bCaseSensitive, + bool _bCaseSensitive, const OUString& _rSchemaName, const OUString& _rName ); diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index bdd33e553008..1ac2a61d4798 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -29,7 +29,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - sal_Bool m_bInDrop; + bool m_bInDrop; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 5fba9d11b24d..628bff320f28 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -111,8 +111,8 @@ namespace connectivity static jclass findMyClass(const char* _pClassName); void obtainMethodId(JNIEnv* _pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID) const; - sal_Bool callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const; - sal_Bool callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const; + bool callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const; + bool callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const; jobject callResultSetMethod( JNIEnv& _rEnv, const char* _pMethodName, jmethodID& _inout_MethodID ) const; sal_Int32 callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID,bool _bIgnoreException = false ) const; sal_Int32 callIntMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const; diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index dec1231f00fd..a99eb4d56676 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -52,9 +52,9 @@ namespace connectivity jclass m_Driver_theClass; java::sql::ConnectionLog m_aLogger; - sal_Bool m_bParameterSubstitution; - sal_Bool m_bIgnoreDriverPrivileges; - sal_Bool m_bIgnoreCurrency; + bool m_bParameterSubstitution; + bool m_bIgnoreDriverPrivileges; + bool m_bIgnoreCurrency; ::com::sun::star::uno::Any m_aCatalogRestriction; ::com::sun::star::uno::Any m_aSchemaRestriction; @@ -88,14 +88,14 @@ namespace connectivity DECLARE_SERVICE_INFO(); // A ctor that is needed for returning the object java_sql_Connection( const java_sql_Driver& _rDriver ); - sal_Bool construct( const OUString& url, + bool construct( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getConnectionInfo() const { return m_aConnectionInfo; } - inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} - inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } + inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + inline bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } inline const ::com::sun::star::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; } inline const ::com::sun::star::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; } diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index f9c338971adb..7753fda1dca4 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx @@ -50,19 +50,19 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE; // 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; virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -200,10 +200,10 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); + bool impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); OUString impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); sal_Int32 impl_callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); - sal_Bool impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ); + bool impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_callResultSetMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index 5dbde09a91cd..49bf97de6d9a 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx @@ -44,7 +44,7 @@ namespace connectivity OUString name(); OUString description(); OUString value(); - sal_Bool required(); + bool required(); ::com::sun::star::uno::Sequence< OUString> choices(); }; } diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index 7696cf7a3b88..3c025d0051e2 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -87,7 +87,7 @@ namespace connectivity // Properties sal_Int32 m_nResultSetConcurrency; sal_Int32 m_nResultSetType; - sal_Bool m_bEscapeProcessing; + bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index 211916c7da59..a4e3a416ab33 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -72,7 +72,7 @@ namespace connectivity @return <TRUE/> if an exception is occurred */ - sal_Bool isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear); + bool isExceptionOccurred(JNIEnv *pEnv,bool _bClear); jobject createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); jobject createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index c379248ffd0b..7810fadf891c 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.hxx @@ -31,10 +31,10 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; public: OMySQLColumns( ::cppu::OWeakObject& _rParent - ,sal_Bool _bCase + ,bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector - ,sal_Bool _bUseHardRef = sal_True + ,bool _bUseHardRef = true ); }; @@ -51,7 +51,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: - OMySQLColumn(sal_Bool _bCase); + OMySQLColumn(bool _bCase); virtual void construct() SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 24bc37757ddf..34e050c9f6a8 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -28,7 +28,7 @@ namespace connectivity class OViews : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - sal_Bool m_bInDrop; + bool m_bInDrop; // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; @@ -42,7 +42,7 @@ namespace connectivity OViews(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) - ,m_bInDrop(sal_False) + ,m_bInDrop(false) {} // only the name is identical to ::cppu::OComponentHelper 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) { |