summaryrefslogtreecommitdiff
path: root/include/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-31 17:30:06 +0200
committerNoel Grandin <noel@peralex.com>2014-04-01 07:38:09 +0200
commit8728c3466211f71cea119a9895a0f4619fd47d96 (patch)
tree35bbe3172566195c6334b145bdf3d3a92012eaca /include/connectivity
parent73c1ac010c544e836cfff4c53542a2bb37630c9f (diff)
connectivity: sal_Bool->bool
Change-Id: Iafa52d3643b9313c20c75cf98f6b1ec231bf9d6d
Diffstat (limited to 'include/connectivity')
-rw-r--r--include/connectivity/sdbcx/VCollection.hxx14
-rw-r--r--include/connectivity/sdbcx/VColumn.hxx28
-rw-r--r--include/connectivity/sdbcx/VDescriptor.hxx16
-rw-r--r--include/connectivity/sdbcx/VGroup.hxx4
-rw-r--r--include/connectivity/sdbcx/VIndex.hxx18
-rw-r--r--include/connectivity/sdbcx/VIndexColumn.hxx14
-rw-r--r--include/connectivity/sdbcx/VKey.hxx10
-rw-r--r--include/connectivity/sdbcx/VKeyColumn.hxx10
-rw-r--r--include/connectivity/sdbcx/VTable.hxx4
-rw-r--r--include/connectivity/sdbcx/VUser.hxx4
-rw-r--r--include/connectivity/sdbcx/VView.hxx4
11 files changed, 60 insertions, 66 deletions
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index c282ed0eb12c..95ef85e2ecae 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -83,7 +83,7 @@ namespace connectivity
virtual ObjectType getObject(sal_Int32 _nIndex) = 0;
virtual ObjectType getObject(const OUString& columnName) = 0;
virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0;
- virtual sal_Bool isCaseSensitive() const = 0;
+ virtual bool isCaseSensitive() const = 0;
};
// OCollection
@@ -100,7 +100,7 @@ namespace connectivity
protected:
::cppu::OWeakObject& m_rParent; // parent of the collection
::osl::Mutex& m_rMutex; // mutex of the parent
- sal_Bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed
+ bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed
// the implementing class should refresh their elements
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0;
@@ -146,11 +146,11 @@ namespace connectivity
ObjectType cloneDescriptor( const ObjectType& _descriptor );
OCollection(::cppu::OWeakObject& _rParent,
- sal_Bool _bCase,
+ bool _bCase,
::osl::Mutex& _rMutex,
const TStringVector &_rVector,
- sal_Bool _bUseIndexOnly = sal_False,
- sal_Bool _bUseHardRef = sal_True);
+ bool _bUseIndexOnly = false,
+ bool _bUseHardRef = true);
/** clear the name map
<p>Does <em>not</em> dispose the objects hold by the collection.</p>
@@ -181,7 +181,7 @@ namespace connectivity
DECLARE_SERVICE_INFO();
void reFill(const TStringVector &_rVector);
- inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
+ inline bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
void renameObject(const OUString& _sOldName, const OUString& _sNewName);
// only the name is identical to ::cppu::OComponentHelper
@@ -226,7 +226,7 @@ namespace connectivity
private:
void notifyElementRemoved(const OUString& _sName);
void disposeElements();
- void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True);
+ void dropImpl(sal_Int32 _nIndex, bool _bReallyDrop = true);
};
}
}
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 6f97e62ae86f..20c2bd6ce684 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -50,22 +50,22 @@ namespace connectivity
public ODescriptor
{
protected:
- OUString m_TypeName;
- OUString m_Description;
- OUString m_DefaultValue;
+ OUString m_TypeName;
+ OUString m_Description;
+ OUString m_DefaultValue;
sal_Int32 m_IsNullable;
sal_Int32 m_Precision;
sal_Int32 m_Scale;
sal_Int32 m_Type;
- sal_Bool m_IsAutoIncrement;
- sal_Bool m_IsRowVersion;
- sal_Bool m_IsCurrency;
+ bool m_IsAutoIncrement;
+ bool m_IsRowVersion;
+ bool m_IsCurrency;
- OUString m_CatalogName;
- OUString m_SchemaName;
- OUString m_TableName;
+ OUString m_CatalogName;
+ OUString m_SchemaName;
+ OUString m_TableName;
using OColumnDescriptor_BASE::rBHelper;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
@@ -76,7 +76,7 @@ namespace connectivity
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
virtual void SAL_CALL release() throw() SAL_OVERRIDE;
- OColumn( sal_Bool _bCase);
+ OColumn( bool _bCase);
OColumn( const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
@@ -85,10 +85,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index f5358dab1c06..1975fae84a3d 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -54,18 +54,18 @@ namespace connectivity
private:
comphelper::UStringMixEqual m_aCase;
- sal_Bool m_bNew;
+ bool m_bNew;
public:
- ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew = sal_False);
+ ODescriptor(::cppu::OBroadcastHelper& _rBHelper, bool _bCase, bool _bNew = false);
virtual ~ODescriptor();
- sal_Bool isNew() const { return m_bNew; }
- sal_Bool getNew() const { return m_bNew; }
- virtual void setNew(sal_Bool _bNew);
+ bool isNew() const { return m_bNew; }
+ bool getNew() const { return m_bNew; }
+ virtual void setNew(bool _bNew);
- sal_Bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); }
+ bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); }
virtual void construct();
@@ -74,7 +74,7 @@ namespace connectivity
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
// compare
- inline sal_Bool operator == ( const OUString & _rRH )
+ inline bool operator == ( const OUString & _rRH )
{
return m_aCase(m_Name,_rRH);
}
@@ -85,7 +85,7 @@ namespace connectivity
static ODescriptor* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSomeComp );
// retrieves the ODescriptor implementation of a given UNO component, and returns its ->isNew flag
- static sal_Bool isNew( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDescriptor );
+ static bool isNew( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDescriptor );
};
}
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index bbda1cc3d49d..fabb75ade8f4 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -64,8 +64,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OGroup(sal_Bool _bCase);
- OGroup( const OUString& _Name,sal_Bool _bCase);
+ OGroup(bool _bCase);
+ OGroup( const OUString& _Name, bool _bCase);
virtual ~OGroup();
DECLARE_SERVICE_INFO();
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 2087f4821403..f5e85edc5304 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -52,10 +52,10 @@ namespace connectivity
public OIndex_BASE
{
protected:
- OUString m_Catalog;
- sal_Bool m_IsUnique;
- sal_Bool m_IsPrimaryKeyIndex;
- sal_Bool m_IsClustered;
+ OUString m_Catalog;
+ bool m_IsUnique;
+ bool m_IsPrimaryKeyIndex;
+ bool m_IsClustered;
OCollection* m_pColumns;
@@ -65,13 +65,13 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OIndex(sal_Bool _bCase);
+ OIndex(bool _bCase);
OIndex( const OUString& _Name,
const OUString& _Catalog,
- sal_Bool _isUnique,
- sal_Bool _isPrimaryKeyIndex,
- sal_Bool _isClustered,
- sal_Bool _bCase);
+ bool _isUnique,
+ bool _isPrimaryKeyIndex,
+ bool _isClustered,
+ bool _bCase);
virtual ~OIndex( );
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index c70670eb7be9..a2eaf61377c2 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -34,12 +34,12 @@ namespace connectivity
public OColumn, public OIndexColumn_PROP
{
protected:
- sal_Bool m_IsAscending;
+ bool m_IsAscending;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OIndexColumn( sal_Bool _bCase);
- OIndexColumn( sal_Bool _IsAscending,
+ OIndexColumn( bool _bCase);
+ OIndexColumn( bool _IsAscending,
const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
@@ -47,10 +47,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 94bb1a66e36f..f135a77b2cde 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -78,14 +78,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OKey(sal_Bool _bCase);
- OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
- /*OKey( const OUString& _Name,
- const OUString& _ReferencedTable,
- sal_Int32 _Type,
- sal_Int32 _UpdateRule,
- sal_Int32 _DeleteRule,
- sal_Bool _bCase);*/
+ OKey(bool _bCase);
+ OKey(const OUString& _Name,const TKeyProperties& _rProps,bool _bCase);
virtual ~OKey( );
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index dcbc416b63d5..afab3066cb01 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -38,7 +38,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OKeyColumn(sal_Bool _bCase);
+ OKeyColumn(bool _bCase);
OKeyColumn( const OUString& _ReferencedColumn,
const OUString& _Name,
const OUString& _TypeName,
@@ -47,10 +47,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 609d0f98e0e4..2e0f86af887e 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -85,9 +85,9 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
OTable( OCollection* _pTables,
- sal_Bool _bCase);
+ bool _bCase);
OTable( OCollection* _pTables,
- sal_Bool _bCase,
+ bool _bCase,
const OUString& _Name,
const OUString& _Type,
const OUString& _Description = OUString(),
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 38f3f4435b62..125ff4a84509 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -61,8 +61,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OUser(sal_Bool _bCase);
- OUser(const OUString& _Name,sal_Bool _bCase);
+ OUser(bool _bCase);
+ OUser(const OUString& _Name,bool _bCase);
virtual ~OUser( );
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 0e1fd2e6d579..b97c273ae21b 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -65,8 +65,8 @@ namespace connectivity
public:
DECLARE_SERVICE_INFO();
- OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
- OView( sal_Bool _bCase,
+ OView(bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
+ OView( bool _bCase,
const OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
sal_Int32 _nCheckOption = 0,