summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/hsqldb
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-16 09:14:24 +0200
committerNoel Grandin <noel@peralex.com>2014-04-16 11:51:51 +0200
commit199d333f131474729a105afa5a3da61205f61df2 (patch)
tree01c0270df697b8857af0ad52fd8bd4502ccf86a0 /connectivity/source/drivers/hsqldb
parent2f316b07a502b527876462d524061dbf6c9a04d5 (diff)
connectivity: sal_Bool->bool
Change-Id: I96371121ce6697f153f4e973e65831ea2265eb56
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
-rw-r--r--connectivity/source/drivers/hsqldb/HCatalog.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HColumns.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx10
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx6
-rw-r--r--connectivity/source/drivers/hsqldb/HTables.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HView.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HViews.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx2
9 files changed, 23 insertions, 23 deletions
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 6e8714453f5c..25529f81c36b 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -73,7 +73,7 @@ void OHCatalog::refreshViews()
Sequence< OUString > aTypes(1);
aTypes[0] = "VIEW";
- sal_Bool bSupportsViews = sal_False;
+ bool bSupportsViews = false;
try
{
Reference<XResultSet> xRes = m_xMetaData->getTableTypes();
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 088e277d7cc5..a369180ea23c 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -33,21 +33,21 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent
- ,sal_Bool _bCase
+ ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,sal_Bool _bUseHardRef
+ ,bool _bUseHardRef
) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
{
}
Reference< XPropertySet > OHSQLColumns::createDescriptor()
{
- return new OHSQLColumn(sal_True);
+ return new OHSQLColumn(true);
}
-OHSQLColumn::OHSQLColumn( sal_Bool _bCase)
+OHSQLColumn::OHSQLColumn( bool _bCase)
: connectivity::sdbcx::OColumn( _bCase )
{
construct();
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 6c79e7419228..f11de6f82ab4 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -93,7 +93,7 @@ namespace connectivity
ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
: ODriverDelegator_BASE(m_aMutex)
,m_xContext(_rxContext)
- ,m_bInShutDownConnections(sal_False)
+ ,m_bInShutDownConnections(false)
{
}
@@ -536,7 +536,7 @@ namespace connectivity
void ODriverDelegator::shutdownConnection(const TWeakPairVector::iterator& _aIter )
{
OSL_ENSURE(m_aConnections.end() != _aIter,"Iterator equals .end()");
- sal_Bool bLastOne = sal_True;
+ bool bLastOne = true;
try
{
Reference<XConnection> _xConnection(_aIter->first.get(),UNO_QUERY);
@@ -601,7 +601,7 @@ namespace connectivity
void ODriverDelegator::shutdownConnections()
{
- m_bInShutDownConnections = sal_True;
+ m_bInShutDownConnections = true;
TWeakPairVector::iterator aEnd = m_aConnections.end();
for (TWeakPairVector::iterator i = m_aConnections.begin(); aEnd != i; ++i)
{
@@ -615,7 +615,7 @@ namespace connectivity
}
}
m_aConnections.clear();
- m_bInShutDownConnections = sal_True;
+ m_bInShutDownConnections = true;
}
void ODriverDelegator::flushConnections()
@@ -658,7 +658,7 @@ namespace connectivity
if ( xStmt.is() )
xStmt->execute( OUString( "SET WRITE_DELAY 0" ) );
- sal_Bool bPreviousAutoCommit = xConnection->getAutoCommit();
+ bool bPreviousAutoCommit = xConnection->getAutoCommit();
xConnection->setAutoCommit( sal_False );
xConnection->commit();
xConnection->setAutoCommit( bPreviousAutoCommit );
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index c42d8b461f2b..08e660d67b13 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -270,14 +270,14 @@ namespace connectivity
if ( ((_nMode & ElementModes::WRITE) != ElementModes::WRITE ) )
{
- sal_Bool bIsStream = sal_True;
+ bool bIsStream = true;
try
{
bIsStream = aStoragePair.first.first->isStreamElement(sStrippedName);
}
catch(const Exception&)
{
- bIsStream = sal_False;
+ bIsStream = false;
}
if ( !bIsStream )
return pHelper; // readonly file without data stream
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index ff96a9abe38d..6ee8f5bf77a4 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -111,7 +111,7 @@ void OHSQLTable::construct()
sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames)
{
- OHSQLColumns* pColumns = new OHSQLColumns(*this,sal_True,m_aMutex,_rNames);
+ OHSQLColumns* pColumns = new OHSQLColumns(*this,true,m_aMutex,_rNames);
pColumns->setParent(this);
return pColumns;
}
@@ -195,7 +195,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe
descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable;
// check also the auto_increment
- sal_Bool bOldAutoIncrement = sal_False,bAutoIncrement = sal_False;
+ bool bOldAutoIncrement = false,bAutoIncrement = false;
xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement;
descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
@@ -280,7 +280,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
(void)_rColName;
#endif
- OHSQLColumn* pColumn = new OHSQLColumn(sal_True);
+ OHSQLColumn* pColumn = new OHSQLColumn(true);
Reference<XPropertySet> xProp = pColumn;
::comphelper::copyProperties(_xDescriptor,xProp);
xProp->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index abd6b81f406b..cd5c1816c7dc 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -119,7 +119,7 @@ sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Refere
void OTables::dropObject(sal_Int32 _nPos,const OUString& _sElementName)
{
Reference< XInterface > xObject( getObject( _nPos ) );
- sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
+ bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
if (!bIsNew)
{
Reference< XConnection > xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
@@ -131,7 +131,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString& _sElementName)
OUString aSql( "DROP " );
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
- sal_Bool bIsView;
+ bool bIsView;
if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == "VIEW"))) // here we have a view
aSql += "VIEW ";
else
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 4749a0651e39..6cf719ab401d 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -59,7 +59,7 @@ namespace connectivity { namespace hsqldb
//= HView
- HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
+ HView::HView( const Reference< XConnection >& _rxConnection, bool _bCaseSensitive,
const OUString& _rSchemaName, const OUString& _rName )
:HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() )
,m_xConnection( _rxConnection )
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 43175cbb43f3..1790e4c6d36b 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -55,7 +55,7 @@ HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObje
:sdbcx::OCollection( _rParent, true, _rMutex, _rVector )
,m_xConnection( _rxConnection )
,m_xMetaData( _rxConnection->getMetaData() )
- ,m_bInDrop( sal_False )
+ ,m_bInDrop( false )
{
}
@@ -105,7 +105,7 @@ void HViews::dropObject(sal_Int32 _nPos,const OUString& /*_sElementName*/)
return;
Reference< XInterface > xObject( getObject( _nPos ) );
- sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
+ bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
if (!bIsNew)
{
OUString aSql( "DROP VIEW" );
@@ -122,9 +122,9 @@ void HViews::dropObject(sal_Int32 _nPos,const OUString& /*_sElementName*/)
void HViews::dropByNameImpl(const OUString& elementName)
{
- m_bInDrop = sal_True;
+ m_bInDrop = true;
OCollection_TYPE::dropByName(elementName);
- m_bInDrop = sal_False;
+ m_bInDrop = false;
}
void HViews::createView( const Reference< XPropertySet >& descriptor )
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index ccc8f28ebbc8..1cd0d912e72e 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -53,7 +53,7 @@ struct ProviderRequest
}
inline
- sal_Bool CREATE_PROVIDER(
+ bool CREATE_PROVIDER(
const OUString& Implname,
const Sequence< OUString > & Services,
::cppu::ComponentInstantiation Factory,