summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx4
-rw-r--r--include/connectivity/sqlbison_exports.hxx2
-rw-r--r--include/connectivity/sqliterator.hxx8
-rw-r--r--include/connectivity/sqlnode.hxx14
-rw-r--r--include/connectivity/sqlparse.hxx6
-rw-r--r--include/connectivity/sqlscan.hxx6
-rw-r--r--include/connectivity/statementcomposer.hxx4
-rw-r--r--include/connectivity/virtualdbtools.hxx6
17 files changed, 60 insertions, 60 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 >
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index bbbe074ce61a..e6bf14ffe55c 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -91,7 +91,7 @@ namespace sdbtools
Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
EntryGuard aGuard( *this );
- dbtools::StatementComposer aComposer(getConnection(), command, commandType, sal_True );
+ dbtools::StatementComposer aComposer(getConnection(), command, commandType, true );
aComposer.setDisposeComposer(false);
return aComposer.getComposer();
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 187c94a90a72..a921c7bcb671 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2922,7 +2922,7 @@ OUString OQueryDesignView::getStatement()
{
::connectivity::OSQLParser& rParser( rController.getParser() );
OUString sErrorMessage;
- boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
+ boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
if ( pParseNode.get() )
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3034,7 +3034,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sSql += " FROM x WHERE ";
sSql += pEntry->GetField();
sSql += _sCriteria;
- boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) );
+ boost::scoped_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
index ad8d011fd68a..0ec8c936963c 100644
--- a/include/connectivity/sqlbison_exports.hxx
+++ b/include/connectivity/sqlbison_exports.hxx
@@ -14,7 +14,7 @@
#include <rtl/ustring.hxx>
#include <connectivity/sqlnode.hxx>
-OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, sal_Bool bInternational);
+OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, bool bInternational);
int SQLyyparse (void);
void setParser( ::connectivity::OSQLParser* );
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 90d040490574..66cb66fcdf60 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -77,7 +77,7 @@ namespace connectivity
OSQLParseNode * pColumnRef,
OUString& aValue,
OSQLParseNode * pParameter);
- void traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder);
+ void traverseByColumnNames(const OSQLParseNode* pSelectNode, bool _bOrder);
void traverseParameters(const OSQLParseNode* pSelectNode);
const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, OUString& aTableRange );
@@ -120,7 +120,7 @@ namespace connectivity
const OUString & rColumnName );
protected:
- void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
+ void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR, bool bAggFkt=false);
void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable);
// Other member variables that should be available in the "set" functions
// can be defined in the derived class. They can be initialized
@@ -275,7 +275,7 @@ namespace connectivity
bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const;
// return true when the tableNode is a rule like catalog_name, schema_name or table_name
- sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const;
+ bool isTableNode(const OSQLParseNode* _pTableNode) const;
// tries to find the correct type of the function
sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
@@ -330,7 +330,7 @@ namespace connectivity
*/
void impl_getQueryParameterColumns( const OSQLTable& _rQuery );
- void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending);
+ void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, bool bAscending);
void setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange);
private:
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 9713135806b4..31ceb290eb80 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -251,7 +251,7 @@ namespace connectivity
OSQLParseNode(const OSQLParseNode& rParseNode);
OSQLParseNode& operator=(const OSQLParseNode& rParseNode);
- sal_Bool operator==(OSQLParseNode& rParseNode) const;
+ bool operator==(OSQLParseNode& rParseNode) const;
// destructor destructs the tree recursively
virtual ~OSQLParseNode();
@@ -359,21 +359,21 @@ namespace connectivity
// IsRule tests whether a node is a rule (NonTerminal)
// ATTENTION: rules can be leaves, for example empty lists
- sal_Bool isRule() const
+ bool isRule() const
{ return (m_eNodeType == SQL_NODE_RULE) || (m_eNodeType == SQL_NODE_LISTRULE)
|| (m_eNodeType == SQL_NODE_COMMALISTRULE);}
// IsToken tests whether a Node is a Token (Terminal but not a rule)
- sal_Bool isToken() const {return !isRule();}
+ bool isToken() const {return !isRule();}
const OUString& getTokenValue() const {return m_aNodeValue;}
void setTokenValue(const OUString& rString) { if (isToken()) m_aNodeValue = rString;}
- sal_Bool isLeaf() const {return m_aChildren.empty();}
+ bool isLeaf() const {return m_aChildren.empty();}
// negate only a searchcondition, any other rule could cause a gpf
- static void negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_Bool bNegate=sal_False);
+ static void negateSearchCondition(OSQLParseNode*& pSearchCondition, bool bNegate=false);
// normalize a logic form
// e.q. (a or b) and (c or d) <=> a and c or a and d or b and c or b and d
@@ -393,7 +393,7 @@ namespace connectivity
static void compress(OSQLParseNode*& pSearchCondition);
// return the catalog, schema and tablename form this node
// _pTableNode must be a rule of that above or a SQL_TOKEN_NAME
- static sal_Bool getTableComponents(const OSQLParseNode* _pTableNode,
+ static bool getTableComponents(const OSQLParseNode* _pTableNode,
::com::sun::star::uno::Any &_rCatalog,
OUString &_rSchema,
OUString &_rTable
@@ -434,7 +434,7 @@ namespace connectivity
*/
bool impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
- sal_Bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
+ bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 4bb97169b147..15e29417a940 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -186,7 +186,7 @@ namespace connectivity
// Parsing an SQLStatement
OSQLParseNode* parseTree(OUString& rErrorMessage,
const OUString& rStatement,
- sal_Bool bInternational = sal_False);
+ bool bInternational = false);
// Check a Predicate
OSQLParseNode* predicateTree(OUString& rErrorMessage, const OUString& rStatement,
@@ -229,10 +229,10 @@ namespace connectivity
// Is the parse in a special mode?
// Predicate chack is used to check a condition for a field
- sal_Bool inPredicateCheck() const {return m_xField.is();}
+ bool inPredicateCheck() const {return m_xField.is();}
const OUString& getFieldName() const {return m_sFieldName;}
- void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank);
+ void reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank);
// does not change the pLiteral argument
sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2);
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 72c2070a051a..038ed7830eb7 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -37,7 +37,7 @@ namespace connectivity
OUString m_sErrorMessage;
sal_Int32 m_nCurrentPos; // next position to read from the statement
- sal_Bool m_bInternational; // do we have a statement which may uses
+ bool m_bInternational; // do we have a statement which may uses
sal_Int32 m_nRule; // rule to be set
public:
@@ -60,13 +60,13 @@ namespace connectivity
virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;
// setting the new information before scanning
- void prepareScan(const OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational);
+ void prepareScan(const OUString & rNewStatement, const IParseContext* pContext, bool bInternational);
const OUString& getErrorMessage() const {return m_sErrorMessage;}
OString getStatement() const { return m_sStatement; }
sal_Int32 SQLlex();
// set this as scanner for flex
- void setScanner(sal_Bool _bNull=sal_False);
+ void setScanner(bool _bNull=false);
// rules settings
void SetRule(sal_Int32 nRule) {m_nRule = nRule;}
sal_Int32 GetGERRule() const;
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index 2d22cbec5f1c..39ead8407760 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -52,8 +52,8 @@ namespace dbtools
StatementComposer(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const OUString& _rCommand,
- const sal_Int32 _nCommandType,
- const sal_Bool _bEscapeProcessing
+ const sal_Int32 _nCommandType,
+ const bool _bEscapeProcessing
);
~StatementComposer();
diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx
index 5eb73a08d3de..332ac8ca252b 100644
--- a/include/connectivity/virtualdbtools.hxx
+++ b/include/connectivity/virtualdbtools.hxx
@@ -197,17 +197,17 @@ 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 = 0;
+ virtual bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0;
/** 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 = 0;
+ virtual bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0;
/** 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 = 0;
+ virtual bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0;
/** determines whether the given component is part of a document which is an embedded database
document (such as a form)
generated by cgit (git 2.34.1) at 2024-07-08 01:39:09 +0000