summaryrefslogtreecommitdiff
path: root/connectivity/source/commontools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-31 15:23:51 +0200
committerNoel Grandin <noel@peralex.com>2014-04-01 07:38:08 +0200
commit2c7bef7b8d71a7ce435695ef6d10f443e7bf26f0 (patch)
tree8ea7dc9e7e5b234fba1379e13a61b235a4dfaae1 /connectivity/source/commontools
parentcb66ea3604ea441ddd03df706bb30e6063fb9a52 (diff)
connectivity: sal_Bool->bool
Change-Id: Ic583deda8b0be3c89bcd644a1872ebd83276487a
Diffstat (limited to 'connectivity/source/commontools')
-rw-r--r--connectivity/source/commontools/CommonTools.cxx12
-rw-r--r--connectivity/source/commontools/TColumnsHelper.cxx4
-rw-r--r--connectivity/source/commontools/TIndex.cxx6
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx4
-rw-r--r--connectivity/source/commontools/dbtools.cxx2
-rw-r--r--connectivity/source/commontools/predicateinput.cxx6
6 files changed, 17 insertions, 17 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 6222ddbbacc0..7f369eee1163 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -54,7 +54,7 @@ namespace connectivity
const sal_Unicode CHAR_PLACE = '_';
const sal_Unicode CHAR_WILD = '%';
- sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape)
+ bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape)
{
int pos=0;
int flag=0;
@@ -65,14 +65,14 @@ namespace connectivity
{
case CHAR_PLACE:
if ( *pStr == 0 )
- return sal_False;
+ return false;
break;
default:
if (*pWild && (*pWild == cEscape) && ((*(pWild+1)== CHAR_PLACE) || (*(pWild+1) == CHAR_WILD)) )
pWild++;
if ( rtl_ascii_toUpperCase(*pWild) != rtl_ascii_toUpperCase(*pStr) )
if ( !pos )
- return sal_False;
+ return false;
else
pWild += pos;
else
@@ -82,7 +82,7 @@ namespace connectivity
while ( *pWild == CHAR_WILD )
pWild++;
if ( *pWild == 0 )
- return sal_True;
+ return true;
flag = 1;
pos = 0;
if ( *pStr == 0 )
@@ -155,9 +155,9 @@ namespace connectivity
return aRet;
}
- sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName )
+ bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( _pJVM.is() )
{
jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM);
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index d9dcd3c56bfa..6802d161e50f 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -59,10 +59,10 @@ namespace connectivity
}
OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent
- ,sal_Bool _bCase
+ ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,sal_Bool _bUseHardRef
+ ,bool _bUseHardRef
) : OCollection(_rParent,_bCase,_rMutex,_rVector,sal_False,_bUseHardRef)
,m_pImpl(NULL)
,m_pTable(NULL)
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index d10516773574..9d20b748f056 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -43,9 +43,9 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
OIndexHelper::OIndexHelper( OTableHelper* _pTable,
const OUString& _Name,
const OUString& _Catalog,
- sal_Bool _isUnique,
- sal_Bool _isPrimaryKeyIndex,
- sal_Bool _isClustered
+ bool _isUnique,
+ bool _isPrimaryKeyIndex,
+ bool _isClustered
) : connectivity::sdbcx::OIndex(_Name,
_Catalog,
_isUnique,
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 8d1bd15871c0..e026f6ce8696 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -141,7 +141,7 @@ namespace connectivity
OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection,
- sal_Bool _bCase)
+ bool _bCase)
:OTable_TYPEDEF(_pTables,_bCase)
,m_pImpl(new OTableHelperImpl(_xConnection))
{
@@ -149,7 +149,7 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection,
- sal_Bool _bCase,
+ bool _bCase,
const OUString& _Name,
const OUString& _Type,
const OUString& _Description ,
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ddc85c5a8e4e..0a4c8c1b9874 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2017,7 +2017,7 @@ void release(oslInterlockedCount& _refCount,
osl_atomic_increment( &_refCount );
}
-void checkDisposed(sal_Bool _bThrow) throw ( DisposedException )
+void checkDisposed(bool _bThrow) throw ( DisposedException )
{
if (_bThrow)
throw DisposedException();
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 7575113be23e..8715ad5f32c1 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -365,14 +365,14 @@ namespace dbtools
0,
0,
nType,
- sal_False,
- sal_False,
+ false,
+ false,
xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
OUString(),
OUString(),
OUString());
Reference<XPropertySet> xColumn = pColumn;
- pColumn->setFunction(sal_True);
+ pColumn->setFunction(true);
pColumn->setRealName(sField);
OSQLParseNode* pParseNode = implPredicateTree( sError, _rPredicateValue, xColumn );