summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-01 07:23:45 +0200
committerNoel Grandin <noel@peralex.com>2014-04-01 07:38:09 +0200
commit39d3f2bb3a7016042e51e4a270814a99f7e62221 (patch)
tree1ebc41d3d7bae7873211241a93a77076a3a3feb1 /connectivity
parent8728c3466211f71cea119a9895a0f4619fd47d96 (diff)
connectivity: sal_Bool->bool
Change-Id: Ice855d69c70d4f5fc119ddf1ddebf18ee6add270
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/predicateinput.cxx2
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx2
-rw-r--r--connectivity/source/parse/sqlbison.y8
-rw-r--r--connectivity/source/parse/sqlflex.l4
-rw-r--r--connectivity/source/parse/sqliterator.cxx14
-rw-r--r--connectivity/source/parse/sqlnode.cxx26
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.cxx6
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.hxx6
8 files changed, 34 insertions, 34 deletions
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index fc99432f3656..f665f7a7be34 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -345,7 +345,7 @@ namespace dbtools
{
// first try the international version
OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue;
- boost::scoped_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
+ boost::scoped_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 4de06b3d8847..5ed6acf6ec2e 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -238,7 +238,7 @@ namespace dbtools
StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
- const OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing )
+ const OUString& _rCommand, const sal_Int32 _nCommandType, const bool _bEscapeProcessing )
:m_pData( new StatementComposer_Data( _rxConnection ) )
{
OSL_PRECOND( _rxConnection.is(), "StatementComposer::StatementComposer: illegal connection!" );
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 92b572bca4e4..97e1ae97bcc6 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4409,7 +4409,7 @@ const Locale& OParseContext::getDefaultLocale()
// Member-Variable.
-OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode* pEscapeNode, sal_Bool bInternational)
+OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode* pEscapeNode, bool bInternational)
{
OUStringBuffer aMatchStr(0);
if (pTokenNode->isToken())
@@ -4554,8 +4554,8 @@ static OUString delComment( const OUString& rQuery )
}
OSQLParseNode* OSQLParser::parseTree(OUString& rErrorMessage,
- const OUString& rStatement,
- sal_Bool bInternational)
+ const OUString& rStatement,
+ bool bInternational)
{
@@ -4751,7 +4751,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
-void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
+void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank)
{
OSL_ENSURE(pLiteral->isRule(), "This is no ::com::sun::star::chaos::Rule");
OSL_ENSURE(pLiteral->count() == 2, "OSQLParser::ReduceLiteral() Invalid count");
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 573cadd2144a..330a853c9d75 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -766,7 +766,7 @@ void OSQLScanner::SQLyyerror(char const *fmt)
}
//------------------------------------------------------------------------------
-void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational)
+void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, bool bInternational)
{
YY_FLUSH_BUFFER;
BEGIN(m_nRule);
@@ -799,7 +799,7 @@ sal_Int32 OSQLScanner::GetSQLRule() const { return SQL; }
sal_Int32 OSQLScanner::GetDATERule() const { return DATE; }
sal_Int32 OSQLScanner::GetSTRINGRule() const { return STRING; }
// -------------------------------------------------------------------------
-void OSQLScanner::setScanner(sal_Bool _bNull)
+void OSQLScanner::setScanner(bool _bNull)
{
xxx_pGLOBAL_SQLSCAN = _bNull ? NULL : this;
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 2b0605543cac..34916935a249 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -340,7 +340,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
break;
OUString sError;
- boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, sal_False ) );
+ boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
if ( !pSubQueryNode.get() )
break;
@@ -1040,11 +1040,11 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSelectNode)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOrderByColumnNames" );
- traverseByColumnNames( pSelectNode, sal_True );
+ traverseByColumnNames( pSelectNode, true );
return !hasErrors();
}
-void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder)
+void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNode, bool _bOrder)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseByColumnNames" );
// aIteratorStatus.Clear();
@@ -1132,7 +1132,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
bool OSQLParseTreeIterator::traverseGroupByColumnNames(const OSQLParseNode* pSelectNode)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseGroupByColumnNames" );
- traverseByColumnNames( pSelectNode, sal_False );
+ traverseByColumnNames( pSelectNode, false );
return !hasErrors();
}
@@ -1693,7 +1693,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum
}
}
-void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt)
+void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt, sal_Int32 _nType, bool bAggFkt)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setSelectColumnName" );
if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
@@ -1874,7 +1874,7 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName
return aAlias;
}
-void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending)
+void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, bool bAscending)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setOrderByColumnName" );
Reference<XPropertySet> xColumn = findSelectColumn( rColumnName );
@@ -2020,7 +2020,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
return pHavingClause;
}
-sal_Bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
+bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::isTableNode" );
return _pTableNode && (SQL_ISRULE(_pTableNode,catalog_name) ||
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index cc69e95f87a4..d5875599bec9 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -688,7 +688,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
if ( bEscapeProcessing && rParam.pParser )
{
OUString sError;
- boost::scoped_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand, sal_False ) );
+ boost::scoped_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand, false ) );
if ( pSubQueryNode.get() )
{
// parse the sub-select to SDBC level, too
@@ -778,7 +778,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c
-sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
+bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
::com::sun::star::uno::Any &_rCatalog,
OUString &_rSchema,
OUString &_rTable,
@@ -1021,7 +1021,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* const& pAppend, OSQLParseNode
switch(pLiteral->getNodeType())
{
case SQL_NODE_STRING:
- pLiteral->m_aNodeValue = ConvertLikeToken(pLiteral, pEscape, sal_False);
+ pLiteral->m_aNodeValue = ConvertLikeToken(pLiteral, pEscape, false);
pAppend->append(pLiteral);
nErg = 1;
break;
@@ -1280,7 +1280,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
else
s_pScanner->SetRule(s_pScanner->GetSQLRule());
- s_pScanner->prepareScan(rStatement, m_pContext, sal_True);
+ s_pScanner->prepareScan(rStatement, m_pContext, true);
SQLyylval.pParseNode = NULL;
// SQLyypvt = NULL;
@@ -1499,7 +1499,7 @@ OSQLParser::~OSQLParser()
OSL_ENSURE(s_nRefCount > 0, "OSQLParser::~OSQLParser() : suspicious call : has a refcount of 0 !");
if (!--s_nRefCount)
{
- s_pScanner->setScanner(sal_True);
+ s_pScanner->setScanner(true);
delete s_pScanner;
s_pScanner = NULL;
@@ -1691,10 +1691,10 @@ OSQLParseNode& OSQLParseNode::operator=(const OSQLParseNode& rParseNode)
}
-sal_Bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
+bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
{
// The members must be equal
- sal_Bool bResult = (m_nNodeID == rParseNode.m_nNodeID) &&
+ bool bResult = (m_nNodeID == rParseNode.m_nNodeID) &&
(m_eNodeType == rParseNode.m_eNodeType) &&
(m_aNodeValue == rParseNode.m_aNodeValue) &&
count() == rParseNode.count();
@@ -1734,7 +1734,7 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode)
m_aChildren.push_back(pNewNode);
}
-sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
+bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::addDateValue" );
// special display for date/time values
@@ -1761,7 +1761,7 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode
if (rParam.aMetaData.shouldEscapeDateTime())
{
// suQuote = "'";
- return sal_False;
+ return false;
}
}
@@ -1782,10 +1782,10 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode
rString.append(rParam.bPredicate ? convertDateTimeString(rParam, sTokenValue) : sTokenValue);
}
rString.append(suQuote);
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString& rColumnName)
@@ -1915,7 +1915,7 @@ void OSQLParseNode::disjunctiveNormalForm(OSQLParseNode*& pSearchCondition)
}
}
-void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_Bool bNegate)
+void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool bNegate)
{
SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::negateSearchCondition" );
if(!pSearchCondition) // no where condition at entry point
@@ -1976,7 +1976,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_
replaceAndReset(pSearchCondition,pBooleanTest);
if (!bNegate)
- negateSearchCondition(pSearchCondition,sal_True); // negate all deeper values
+ negateSearchCondition(pSearchCondition, true); // negate all deeper values
}
// row_value_constructor comparison row_value_constructor
// row_value_constructor comparison any_all_some subquery
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 8c57778cdba0..dba6091ec8b5 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -155,19 +155,19 @@ namespace connectivity
}
- sal_Bool ODataAccessStaticTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
+ bool ODataAccessStaticTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
{
return ::dbtools::canInsert( _rxCursorSet );
}
- sal_Bool ODataAccessStaticTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
+ bool ODataAccessStaticTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
{
return ::dbtools::canUpdate( _rxCursorSet );
}
- sal_Bool ODataAccessStaticTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const
+ bool ODataAccessStaticTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const
{
return ::dbtools::canDelete( _rxCursorSet );
}
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index f27c9987f00d..3eb9590e34c6 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -145,19 +145,19 @@ namespace connectivity
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
@param _rxCursorSet the property set
*/
- virtual sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
+ virtual bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
@param _rxCursorSet the property set
*/
- virtual sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
+ virtual bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
@param _rxCursorSet the property set
*/
- virtual sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
+ virtual bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >