summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/api
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-12 16:15:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-12 16:15:27 +0200
commitb396ae62f7e224dbc5fe71d19d987804a02f398f (patch)
treef5e0c94211a54295dbb2a8c9ba92d5bda508f4e4 /dbaccess/source/core/api
parent6fb5bf5266e678b6d10fc012fefaad69e2589f3f (diff)
dbaccess: sal_Bool -> bool
Change-Id: Ifad71823e72be71cbd9f9f58a51f4553ff54e4d4
Diffstat (limited to 'dbaccess/source/core/api')
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx6
-rw-r--r--dbaccess/source/core/api/CacheSet.hxx6
-rw-r--r--dbaccess/source/core/api/KeySet.cxx12
-rw-r--r--dbaccess/source/core/api/KeySet.hxx6
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx16
5 files changed, 23 insertions, 23 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 83e28fc06d71..65c5e83cfcda 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -573,17 +573,17 @@ bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException)
return m_xDriverSet->previous();
}
-bool OCacheSet::last_checked( sal_Bool /*i_bFetchRow*/)
+bool OCacheSet::last_checked( bool /*i_bFetchRow*/)
{
return last();
}
-bool OCacheSet::previous_checked( sal_Bool /*i_bFetchRow*/ )
+bool OCacheSet::previous_checked( bool /*i_bFetchRow*/ )
{
return previous();
}
-bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ )
+bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ )
{
return absolute(row);
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index a42c3ee57fa3..822827856287 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -141,9 +141,9 @@ namespace dbaccess
virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow);
virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns);
virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const;
- virtual bool previous_checked( sal_Bool i_bFetchRow );
- virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow );
- virtual bool last_checked( sal_Bool i_bFetchRow);
+ virtual bool previous_checked( bool i_bFetchRow );
+ virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow );
+ virtual bool last_checked( bool i_bFetchRow);
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index a9ed584b7175..2c75718a4ab3 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1210,10 +1210,10 @@ bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException)
bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException)
{
- return last_checked(sal_True);
+ return last_checked(true);
}
-bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
+bool OKeySet::last_checked( bool /* i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
bool fetchedRow = fillAllRows();
@@ -1237,10 +1237,10 @@ sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException)
bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
{
- return absolute_checked(row,sal_True);
+ return absolute_checked(row,true);
}
-bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
+bool OKeySet::absolute_checked( sal_Int32 row, bool /* i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
OSL_ENSURE(row,"absolute(0) isn't allowed!");
@@ -1309,7 +1309,7 @@ bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeExc
return absolute(getRow()+rows);
}
-bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
+bool OKeySet::previous_checked( bool /* i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
if(m_aKeyIter != m_aKeyMap.begin())
@@ -1322,7 +1322,7 @@ bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException)
{
- return previous_checked(sal_True);
+ return previous_checked(true);
}
bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException)
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 5cc816b3b61e..49e60fb4c162 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -228,9 +228,9 @@ namespace dbaccess
virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool previous_checked( sal_Bool i_bFetchRow ) SAL_OVERRIDE;
- virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow ) SAL_OVERRIDE;
- virtual bool last_checked( sal_Bool i_bFetchRow) SAL_OVERRIDE;
+ virtual bool previous_checked( bool i_bFetchRow ) SAL_OVERRIDE;
+ virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow ) SAL_OVERRIDE;
+ virtual bool last_checked( bool i_bFetchRow) SAL_OVERRIDE;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index f4e84dc98617..07cfa1912d01 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -722,7 +722,7 @@ bool ORowSetCache::afterLast( )
if(!m_bRowCountFinal)
{
- m_pCacheSet->last_checked(sal_False);
+ m_pCacheSet->last_checked(false);
m_bRowCountFinal = true;
m_nRowCount = m_pCacheSet->getRow();// + 1 removed
}
@@ -774,7 +774,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos)
if(!m_bRowCountFinal)
{
- if(m_pCacheSet->previous_checked(sal_False)) // because we stand after the last row
+ if(m_pCacheSet->previous_checked(false)) // because we stand after the last row
m_nRowCount = m_pCacheSet->getRow(); // here we have the row count
if(!m_nRowCount)
m_nRowCount = i-1; // it can be that getRow return zero
@@ -815,7 +815,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos)
{
if(!m_pCacheSet->next())
{
- if(m_pCacheSet->previous_checked(sal_False)) // because we stand after the last row
+ if(m_pCacheSet->previous_checked(false)) // because we stand after the last row
m_nRowCount = m_pCacheSet->getRow(); // here we have the row count
m_bRowCountFinal = true;
}
@@ -853,7 +853,7 @@ bool ORowSetCache::moveWindow()
// but only when we don't know it already
if ( !m_bRowCountFinal )
{
- bOk = m_pCacheSet->absolute_checked( m_nPosition + 1,sal_False );
+ bOk = m_pCacheSet->absolute_checked( m_nPosition + 1,false );
if ( bOk )
m_nRowCount = std::max(sal_Int32(m_nPosition+1),m_nRowCount);
}
@@ -861,7 +861,7 @@ bool ORowSetCache::moveWindow()
if(!bOk && !m_bRowCountFinal)
{
// because we stand after the last row
- m_nRowCount = m_pCacheSet->previous_checked(sal_False) ? m_pCacheSet->getRow() : 0;
+ m_nRowCount = m_pCacheSet->previous_checked(false) ? m_pCacheSet->getRow() : 0;
m_bRowCountFinal = true;
}
}
@@ -1018,7 +1018,7 @@ bool ORowSetCache::moveWindow()
bOk = m_pCacheSet->next();
if(!bOk)
{
- m_pCacheSet->previous_checked(sal_False); // because we stand after the last row
+ m_pCacheSet->previous_checked(false); // because we stand after the last row
m_nRowCount = nPos; // here we have the row count
OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos is not valid!");
m_bRowCountFinal = true;
@@ -1045,7 +1045,7 @@ bool ORowSetCache::moveWindow()
if ( !m_bRowCountFinal )
{
- m_pCacheSet->previous_checked(sal_False); // because we stand after the last row
+ m_pCacheSet->previous_checked(false); // because we stand after the last row
m_nRowCount = std::max(m_nRowCount, nPos); // here we have the row count
OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos isn't valid!");
m_bRowCountFinal = true;
@@ -1058,7 +1058,7 @@ bool ORowSetCache::moveWindow()
aIter = m_pMatrix->begin();
nPos = m_nStartPos + 1;
- bCheck = m_pCacheSet->absolute_checked(nPos, sal_True);
+ bCheck = m_pCacheSet->absolute_checked(nPos, true);
for(; !aIter->is() && bCheck;++aIter, ++nPos)
{
OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator");