diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-31 15:23:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-01 07:38:08 +0200 |
commit | 2c7bef7b8d71a7ce435695ef6d10f443e7bf26f0 (patch) | |
tree | 8ea7dc9e7e5b234fba1379e13a61b235a4dfaae1 /include/connectivity | |
parent | cb66ea3604ea441ddd03df706bb30e6063fb9a52 (diff) |
connectivity: sal_Bool->bool
Change-Id: Ic583deda8b0be3c89bcd644a1872ebd83276487a
Diffstat (limited to 'include/connectivity')
-rw-r--r-- | include/connectivity/CommonTools.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/PColumn.hxx | 40 | ||||
-rw-r--r-- | include/connectivity/TColumnsHelper.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/TIndex.hxx | 6 | ||||
-rw-r--r-- | include/connectivity/TTableHelper.hxx | 4 |
5 files changed, 31 insertions, 31 deletions
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index f98e18e2c2bb..bbf919cced16 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -51,8 +51,8 @@ namespace jvmaccess { class VirtualMachine; } namespace connectivity { - OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); - inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) + OOO_DLLPUBLIC_DBTOOLS bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); + inline bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) { return match(rWild.getStr(), rStr.getStr(), cEscape); } @@ -150,7 +150,7 @@ namespace connectivity const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); - OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); + OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); #if HAVE_FEATURE_JAVA /** creates a java virtual machine @@ -167,7 +167,7 @@ namespace connectivity @param _sClassName The class name to look for. */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); + OOO_DLLPUBLIC_DBTOOLS bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); #endif } diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 0bbe03fea928..69fdbb2188e9 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -44,12 +44,12 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP { - OUString m_aRealName; - OUString m_sLabel; - sal_Bool m_bFunction; - sal_Bool m_bDbasePrecisionChanged; - sal_Bool m_bAggregateFunction; - sal_Bool m_bIsSearchable; + OUString m_aRealName; + OUString m_sLabel; + bool m_bFunction; + bool m_bDbasePrecisionChanged; + bool m_bAggregateFunction; + bool m_bIsSearchable; protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; @@ -57,7 +57,7 @@ namespace connectivity virtual ~OParseColumn(); public: - OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); + OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bCase); OParseColumn(const OUString& _Name, const OUString& _TypeName, const OUString& _DefaultValue, @@ -66,9 +66,9 @@ namespace connectivity sal_Int32 _Precision, sal_Int32 _Scale, sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsCurrency, - sal_Bool _bCase, + bool _IsAutoIncrement, + bool _IsCurrency, + bool _bCase, const OUString& _CatalogName, const OUString& _SchemaName, const OUString& _TableName); @@ -78,16 +78,16 @@ namespace connectivity void setRealName(const OUString& _rName) { m_aRealName = _rName; } void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } void setTableName(const OUString& _rName) { m_TableName = _rName; } - void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } - void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } - void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } - void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } + void setFunction(bool _bFunction) { m_bFunction = _bFunction; } + void setAggregateFunction(bool _bFunction) { m_bAggregateFunction = _bFunction; } + void setIsSearchable( bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } + void setDbasePrecisionChanged(bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } const OUString& getRealName() const { return m_aRealName; } const OUString& getLabel() const { return m_sLabel; } const OUString& getTableName() const { return m_TableName; } - sal_Bool getFunction() const { return m_bFunction; } - sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } + bool getFunction() const { return m_bFunction; } + bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } public: /** creates a collection of OParseColumn, as described by a result set meta data instance. @@ -134,14 +134,14 @@ namespace connectivity OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName, - sal_Bool _bCase, - sal_Bool _bAscending + bool _bCase, + bool _bAscending ); OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, - sal_Bool _bCase, - sal_Bool _bAscending + bool _bCase, + bool _bAscending ); virtual void construct() SAL_OVERRIDE; diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index 4e3fee488d8e..50b8b14d8dab 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -44,10 +44,10 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE; public: OColumnsHelper( ::cppu::OWeakObject& _rParent - ,sal_Bool _bCase + ,bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector - ,sal_Bool _bUseHardRef = sal_True + ,bool _bUseHardRef = true ); virtual ~OColumnsHelper(); diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index 7612768931f1..7b22e61044a0 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -37,9 +37,9 @@ namespace connectivity OIndexHelper( OTableHelper* _pTable, const OUString& _Name, const OUString& _Catalog, - sal_Bool _isUnique, - sal_Bool _isPrimaryKeyIndex, - sal_Bool _isClustered + bool _isUnique, + bool _isPrimaryKeyIndex, + bool _isClustered ); inline OTableHelper* getTable() const { return m_pTable; } }; diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 9f4081d1bc47..a125222a0cf2 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -127,10 +127,10 @@ namespace connectivity public: OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - sal_Bool _bCase); + bool _bCase); OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - sal_Bool _bCase, + bool _bCase, const OUString& _Name, const OUString& _Type, const OUString& _Description = OUString(), |