[Libreoffice-commits] core.git: 6 commits - connectivity/source cui/source dbaccess/source forms/source include/connectivity include/linguistic linguistic/source sw/source
Noel Grandin
noel at peralex.com
Mon Mar 31 22:39:13 PDT 2014
connectivity/source/commontools/CommonTools.cxx | 22 ++---
connectivity/source/commontools/DateConversion.cxx | 2
connectivity/source/commontools/TColumnsHelper.cxx | 10 +-
connectivity/source/commontools/TIndex.cxx | 10 +-
connectivity/source/commontools/TIndexColumns.cxx | 6 -
connectivity/source/commontools/TIndexes.cxx | 6 -
connectivity/source/commontools/TKey.cxx | 4
connectivity/source/commontools/TKeyColumns.cxx | 8 -
connectivity/source/commontools/TKeys.cxx | 2
connectivity/source/commontools/TTableHelper.cxx | 12 +-
connectivity/source/commontools/conncleanup.cxx | 12 +-
connectivity/source/commontools/dbcharset.cxx | 4
connectivity/source/commontools/dbexception.cxx | 4
connectivity/source/commontools/dbtools.cxx | 28 +++---
connectivity/source/commontools/dbtools2.cxx | 28 +++---
connectivity/source/commontools/filtermanager.cxx | 2
connectivity/source/commontools/formattedcolumnvalue.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 28 +++---
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 4
connectivity/source/drivers/dbase/DIndexColumns.cxx | 8 -
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/file/FColumns.cxx | 6 -
connectivity/source/drivers/file/FPreparedStatement.cxx | 4
connectivity/source/drivers/firebird/Columns.cxx | 4
connectivity/source/drivers/firebird/Table.cxx | 6 -
connectivity/source/drivers/firebird/Tables.cxx | 2
connectivity/source/drivers/firebird/User.cxx | 6 -
connectivity/source/drivers/firebird/Users.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 6 -
connectivity/source/drivers/hsqldb/HTable.cxx | 10 +-
connectivity/source/drivers/hsqldb/HTables.cxx | 2
connectivity/source/drivers/hsqldb/HUser.cxx | 4
connectivity/source/drivers/hsqldb/HUsers.cxx | 2
connectivity/source/drivers/hsqldb/HViews.cxx | 4
connectivity/source/drivers/mork/MColumns.cxx | 2
connectivity/source/drivers/mork/MColumns.hxx | 2
connectivity/source/drivers/mork/MPreparedStatement.cxx | 6 -
connectivity/source/drivers/mork/MTable.cxx | 2
connectivity/source/drivers/mork/MTables.hxx | 2
connectivity/source/drivers/mysql/YTable.cxx | 8 -
connectivity/source/drivers/mysql/YTables.cxx | 2
connectivity/source/drivers/mysql/YUser.cxx | 4
connectivity/source/drivers/mysql/YUsers.cxx | 2
connectivity/source/drivers/mysql/YViews.cxx | 2
connectivity/source/inc/hsqldb/HTables.hxx | 2
connectivity/source/inc/mysql/YTables.hxx | 2
connectivity/source/inc/mysql/YViews.hxx | 2
connectivity/source/parse/PColumn.cxx | 36 ++++----
connectivity/source/parse/sqlbison.y | 8 -
connectivity/source/parse/sqlflex.l | 4
connectivity/source/parse/sqliterator.cxx | 52 ++++++------
connectivity/source/parse/sqlnode.cxx | 26 +++---
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VCollection.cxx | 18 ++--
connectivity/source/sdbcx/VColumn.cxx | 20 ++--
connectivity/source/sdbcx/VDescriptor.cxx | 8 -
connectivity/source/sdbcx/VGroup.cxx | 4
connectivity/source/sdbcx/VIndex.cxx | 18 ++--
connectivity/source/sdbcx/VIndexColumn.cxx | 26 +++---
connectivity/source/sdbcx/VKey.cxx | 6 -
connectivity/source/sdbcx/VKeyColumn.cxx | 24 ++---
connectivity/source/sdbcx/VTable.cxx | 8 -
connectivity/source/sdbcx/VUser.cxx | 6 -
connectivity/source/sdbcx/VView.cxx | 8 -
connectivity/source/simpledbt/staticdbtools_s.cxx | 6 -
connectivity/source/simpledbt/staticdbtools_s.hxx | 6 -
cui/source/dialogs/SpellDialog.cxx | 6 -
cui/source/options/optdict.cxx | 2
dbaccess/source/core/api/CacheSet.cxx | 2
dbaccess/source/core/api/FilteredContainer.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 4
dbaccess/source/core/api/RowSetBase.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 22 ++---
dbaccess/source/core/api/definitioncolumn.cxx | 2
dbaccess/source/core/api/tablecontainer.cxx | 2
dbaccess/source/core/api/viewcontainer.cxx | 2
dbaccess/source/sdbtools/connection/connectiontools.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 4
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2
dbaccess/source/ui/control/tabletree.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/dlg/dlgsave.cxx | 2
dbaccess/source/ui/dlg/paramdialog.cxx | 4
dbaccess/source/ui/dlg/queryfilter.cxx | 4
dbaccess/source/ui/inc/charsets.hxx | 2
dbaccess/source/ui/misc/UITools.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 6 -
dbaccess/source/ui/misc/charsets.cxx | 6 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 10 +-
forms/source/component/Filter.cxx | 4
forms/source/component/FormattedField.cxx | 2
include/connectivity/CommonTools.hxx | 8 -
include/connectivity/PColumn.hxx | 40 ++++-----
include/connectivity/TColumnsHelper.hxx | 4
include/connectivity/TIndex.hxx | 6 -
include/connectivity/TTableHelper.hxx | 4
include/connectivity/conncleanup.hxx | 8 -
include/connectivity/dbcharset.hxx | 2
include/connectivity/dbconversion.hxx | 2
include/connectivity/dbexception.hxx | 6 -
include/connectivity/dbtools.hxx | 38 ++++----
include/connectivity/filtermanager.hxx | 6 -
include/connectivity/predicateinput.hxx | 10 +-
include/connectivity/sdbcx/VCollection.hxx | 14 +--
include/connectivity/sdbcx/VColumn.hxx | 28 +++---
include/connectivity/sdbcx/VDescriptor.hxx | 16 +--
include/connectivity/sdbcx/VGroup.hxx | 4
include/connectivity/sdbcx/VIndex.hxx | 18 ++--
include/connectivity/sdbcx/VIndexColumn.hxx | 14 +--
include/connectivity/sdbcx/VKey.hxx | 10 --
include/connectivity/sdbcx/VKeyColumn.hxx | 10 +-
include/connectivity/sdbcx/VTable.hxx | 4
include/connectivity/sdbcx/VUser.hxx | 4
include/connectivity/sdbcx/VView.hxx | 4
include/connectivity/sqlbison_exports.hxx | 2
include/connectivity/sqliterator.hxx | 8 -
include/connectivity/sqlnode.hxx | 14 +--
include/connectivity/sqlparse.hxx | 6 -
include/connectivity/sqlscan.hxx | 6 -
include/connectivity/statementcomposer.hxx | 4
include/connectivity/virtualdbtools.hxx | 6 -
include/linguistic/hyphdta.hxx | 8 -
include/linguistic/lngprophelp.hxx | 48 +++++------
include/linguistic/misc.hxx | 24 ++---
include/linguistic/spelldta.hxx | 4
linguistic/source/convdic.cxx | 2
linguistic/source/lngprophelp.cxx | 64 +++++++--------
linguistic/source/misc.cxx | 62 +++++++-------
linguistic/source/misc2.cxx | 4
linguistic/source/spelldsp.cxx | 6 -
linguistic/source/spelldta.cxx | 12 +-
sw/source/core/uibase/lingu/olmenu.cxx | 4
140 files changed, 621 insertions(+), 627 deletions(-)
New commits:
commit 39d3f2bb3a7016042e51e4a270814a99f7e62221
Author: Noel Grandin <noel at peralex.com>
Date: Tue Apr 1 07:23:45 2014 +0200
connectivity: sal_Bool->bool
Change-Id: Ice855d69c70d4f5fc119ddf1ddebf18ee6add270
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index fc99432..f665f7a 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 4de06b3..5ed6acf 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 92b572b..97e1ae9 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 573cadd..330a853c 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 2b06055..3491693 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 at 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 at 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 at 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 at 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 at 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 at 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 cc69e95..d587559 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 at 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 at 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 8c57778c..dba6091 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 f27c998..3eb9590 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 bbbe074..e6bf14f 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 187c94a..a921c7b 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 ad8d011..0ec8c936 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 90d0404..66cb66f 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 9713135..31ceb29 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 4bb9716..15e2941 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 72c2070..038ed783 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 2d22cbe..39ead84 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 5eb73a0..332ac8c 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)
commit 8728c3466211f71cea119a9895a0f4619fd47d96
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 31 17:30:06 2014 +0200
connectivity: sal_Bool->bool
Change-Id: Iafa52d3643b9313c20c75cf98f6b1ec231bf9d6d
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 6802d16..05ac275 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -63,7 +63,7 @@ OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
,bool _bUseHardRef
- ) : OCollection(_rParent,_bCase,_rMutex,_rVector,sal_False,_bUseHardRef)
+ ) : OCollection(_rParent,_bCase,_rMutex,_rVector,false,_bUseHardRef)
,m_pImpl(NULL)
,m_pTable(NULL)
{
@@ -129,7 +129,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
pColDesc->nField9,
pColDesc->nField5,
bAutoIncrement,
- sal_False,
+ false,
bIsCurrency,
isCaseSensitive(),
aCatalog,
@@ -165,7 +165,7 @@ void OColumnsHelper::impl_refresh() throw(RuntimeException)
Reference< XPropertySet > OColumnsHelper::createDescriptor()
{
- return new OColumn(sal_True);
+ return new OColumn(true);
}
// XAppend
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 9d20b74..7f50696 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True)
+OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(true)
, m_pTable(_pTable)
{
construct();
@@ -50,7 +50,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable,
_Catalog,
_isUnique,
_isPrimaryKeyIndex,
- _isClustered,sal_True)
+ _isClustered,true)
,m_pTable(_pTable)
{
construct();
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 025e131..31d1367 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::lang;
OIndexColumns::OIndexColumns( OIndexHelper* _pIndex,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector)
- : connectivity::sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector)
+ : connectivity::sdbcx::OCollection(*_pIndex,true,_rMutex,_rVector)
,m_pIndex(_pIndex)
{
}
@@ -94,7 +94,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
nSize,
nDec,
nDataType,
- sal_False,sal_False,sal_False,sal_True,
+ false,false,false,true,
aCatalog, aSchema, aTable);
xRet = pRet;
break;
@@ -107,7 +107,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
Reference< XPropertySet > OIndexColumns::createDescriptor()
{
- return new OIndexColumn(sal_True);
+ return new OIndexColumn(true);
}
void OIndexColumns::impl_refresh() throw(RuntimeException)
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 27c7e16..f98bc1b 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -42,7 +42,7 @@ OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector
)
- : OCollection(*_pTable,sal_True,_rMutex,_rVector)
+ : OCollection(*_pTable,true,_rMutex,_rVector)
,m_pTable(_pTable)
{
}
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 4b984bf..b269ab2 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::OKey(sal_True)
+OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::OKey(true)
,m_pTable(_pTable)
{
construct();
@@ -40,7 +40,7 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O
OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable
,const OUString& _Name
,const sdbcx::TKeyProperties& _rProps
- ) : connectivity::sdbcx::OKey(_Name,_rProps,sal_True)
+ ) : connectivity::sdbcx::OKey(_Name,_rProps,true)
,m_pTable(_pTable)
{
construct();
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 73ab71c..c79bcca 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector)
- : connectivity::sdbcx::OCollection(*_pKey,sal_True,_rMutex,_rVector)
+ : connectivity::sdbcx::OCollection(*_pKey,true,_rMutex,_rVector)
,m_pKey(_pKey)
{
}
@@ -109,9 +109,9 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
nSize,
nDec,
nDataType,
- sal_False,
- sal_False,
- sal_False,
+ false,
+ false,
+ false,
isCaseSensitive(),
aCatalog,
aSchema,
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index abdb2f0..693e686 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::lang;
OKeysHelper::OKeysHelper( OTableHelper* _pTable,
::osl::Mutex& _rMutex,
const TStringVector& _rVector
- ) : OKeys_BASE(*_pTable,sal_True,_rMutex,_rVector,sal_True)
+ ) : OKeys_BASE(*_pTable,true,_rMutex,_rVector,true)
,m_pTable(_pTable)
{
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index f2fc329..d6f58bc 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -492,7 +492,7 @@ namespace
nField9,
nField5,
bAutoIncrement,
- sal_False,
+ false,
bIsCurrency,
_bCase,
sCatalog,
@@ -561,7 +561,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
0,
DataType::VARCHAR,
_bIsAutoIncrement,
- sal_False,
+ false,
_bIsCurrency,
_bCase,
sCatalog,
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 718fe08..23faa3b 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -510,7 +510,7 @@ void OCalcTable::fillColumns()
sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, OUString(),OUString(),
ColumnValue::NULLABLE, nPrecision, nDecimals,
- eType, sal_False, sal_False, bCurrency,
+ eType, false, false, bCurrency,
bStoresMixedCaseQuotedIdentifiers,
m_CatalogName, getSchema(), getName());
Reference< XPropertySet> xCol = pColumn;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 8c314f3..afbf1ab 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -57,7 +57,7 @@ using namespace com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index");
ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
- : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
+ : OIndex(true/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
, m_pFileStream(NULL)
, m_nCurNode(NODE_NOTFOUND)
, m_nPageCount(0)
@@ -72,7 +72,7 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable,
const NDXHeader& _rHeader,
const OUString& _rName)
- : OIndex(_rName,OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True)
+ : OIndex(_rName, OUString(), _rHeader.db_unique, false, false, true)
, m_pFileStream(NULL)
, m_aHeader(_rHeader)
, m_nCurNode(NODE_NOTFOUND)
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 16ab90e..a39484a 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -49,16 +49,16 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
if(!xCol.is())
return sdbcx::ObjectType();
- sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName
+ sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(true,_rName
,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
,OUString()
,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
- ,sal_False
- ,sal_False
- ,sal_False
+ ,false
+ ,false
+ ,false
,pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()
,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME)))
,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)))
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 0577115..c19a466 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -429,7 +429,7 @@ void ODbaseTable::fillColumns()
nPrecision,
aDBFColumn.db_dez,
eType,
- sal_False,
+ false,
bIsRowVersion,
bIsCurrency,
bCase,
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 1f894a1..3f1bdbd 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -59,9 +59,9 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
xRow->getInt(7),
xRow->getInt(9),
xRow->getInt(5),
- sal_False,
- sal_False,
- sal_False,
+ false,
+ false,
+ false,
m_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
sCatalogName,
sSchemaName,
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index 63d9404..70e3272 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -34,7 +34,7 @@ Tables::Tables(const uno::Reference< XDatabaseMetaData >& rMetaData,
Mutex& rMutex,
TStringVector& rNames) :
OCollection(rParent,
- sal_True,
+ true,
rMutex,
rNames),
m_rMutex(rMutex),
diff --git a/connectivity/source/drivers/firebird/User.cxx b/connectivity/source/drivers/firebird/User.cxx
index 885ecff..a9e6fc4 100644
--- a/connectivity/source/drivers/firebird/User.cxx
+++ b/connectivity/source/drivers/firebird/User.cxx
@@ -19,14 +19,14 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::sdbc;
User::User(const uno::Reference< XConnection >& rConnection):
- OUser(sal_True) // Case Sensitive
+ OUser(true) // Case Sensitive
{
(void) rConnection;
}
User::User(const uno::Reference< XConnection >& rConnection, const OUString& rName):
OUser(rName,
- sal_True) // Case Sensitive
+ true) // Case Sensitive
{
(void) rConnection;
}
@@ -35,4 +35,4 @@ User::User(const uno::Reference< XConnection >& rConnection, const OUString& rNa
void User::refreshGroups()
{
// TODO: implement.
-}
\ No newline at end of file
+}
diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx
index 6e9f866..e95cbb7 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -34,7 +34,7 @@ Users::Users(const uno::Reference< XDatabaseMetaData >& rMetaData,
Mutex& rMutex,
TStringVector& rNames) :
OCollection(rParent,
- sal_True,
+ true,
rMutex,
rNames),
m_xMetaData(rMetaData)
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index cff9047..e156b1d 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -185,9 +185,9 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
m_aPrecisions[i],
m_aScales[i],
m_aTypes[i],
- sal_False,
- sal_False,
- sal_False,
+ false,
+ false,
+ false,
bCase,
m_CatalogName, getSchema(), getName());
Reference< XPropertySet> xCol = pColumn;
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 64fdc45..83eece4 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True)
+OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true)
,m_xConnection(_xConnection)
{
construct();
@@ -44,7 +44,7 @@ OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star
OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
const OUString& _Name
- ) : connectivity::sdbcx::OUser(_Name,sal_True)
+ ) : connectivity::sdbcx::OUser(_Name, true)
,m_xConnection(_xConnection)
{
construct();
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 947cde1..3bf553f 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -42,7 +42,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
const TStringVector &_rVector,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
connectivity::sdbcx::IRefreshableUsers* _pParent)
- : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xConnection(_xConnection)
,m_pParent(_pParent)
{
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 2a01e30..43175cb 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -52,7 +52,7 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE;
HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
const TStringVector &_rVector )
- :sdbcx::OCollection( _rParent, sal_True, _rMutex, _rVector )
+ :sdbcx::OCollection( _rParent, true, _rMutex, _rVector )
,m_xConnection( _rxConnection )
,m_xMetaData( _rxConnection->getMetaData() )
,m_bInDrop( sal_False )
@@ -87,7 +87,7 @@ m_xMetaData.clear();
Reference< XPropertySet > HViews::createDescriptor()
{
Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
- connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData());
+ connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(true, xConnection->getMetaData());
return pNew;
}
diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index 57851ee..ba872cb 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -69,7 +69,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
nPrec,
xRow->getInt(9),
nType,
- sal_False,sal_False,sal_False,sal_True,
+ false,false,false,true,
sCatalogName,
sSchemaName,
sTableName);
diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx
index 8186468..0135f76 100644
--- a/connectivity/source/drivers/mork/MColumns.hxx
+++ b/connectivity/source/drivers/mork/MColumns.hxx
@@ -40,7 +40,7 @@ namespace connectivity
OColumns( OTable* _pTable,
::osl::Mutex& _rMutex,
const TStringVector &_rVector
- ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector)
+ ) : sdbcx::OCollection(*_pTable, true, _rMutex, _rVector)
,m_pTable(_pTable)
{}
};
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 9a39670..a141bdf 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -439,9 +439,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
,nPrecision
,nScale
,eType
- ,sal_False
- ,sal_False
- ,sal_False
+ ,false
+ ,false
+ ,false
,m_pSQLIterator->isCaseSensitive()
,OUString()
,OUString()
diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx
index 1098b21..1193018 100644
--- a/connectivity/source/drivers/mork/MTables.hxx
+++ b/connectivity/source/drivers/mork/MTables.hxx
@@ -34,7 +34,7 @@ namespace connectivity
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
public:
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
{}
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index defc318..eeb2315 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -297,7 +297,7 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName,
" CHANGE " + ::dbtools::quoteName(sQuote,_rColName) +
" ";
- OColumn* pColumn = new OColumn(sal_True);
+ OColumn* pColumn = new OColumn(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/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 3f6edd3..4d955ee 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True)
+OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true)
,m_xConnection(_xConnection)
{
construct();
@@ -44,7 +44,7 @@ OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star
OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
const OUString& _Name
- ) : connectivity::sdbcx::OUser(_Name,sal_True)
+ ) : connectivity::sdbcx::OUser(_Name, true)
,m_xConnection(_xConnection)
{
construct();
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index ff8e9fe..b4342d3 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -42,7 +42,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
const TStringVector &_rVector,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
connectivity::sdbcx::IRefreshableUsers* _pParent)
- : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xConnection(_xConnection)
,m_pParent(_pParent)
{
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 4a87c34..29cd614 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -81,7 +81,7 @@ m_xMetaData.clear();
Reference< XPropertySet > OViews::createDescriptor()
{
Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
- connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData());
+ connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(true, xConnection->getMetaData());
return pNew;
}
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 87ec047..2858e90 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -40,7 +40,7 @@ namespace connectivity
virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) SAL_OVERRIDE;
public:
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
{}
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 1175c18..441c31e 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -42,7 +42,7 @@ namespace connectivity
virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) SAL_OVERRIDE;
public:
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
{}
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index d499979..24bc377 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -40,7 +40,7 @@ namespace connectivity
void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
public:
OViews(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
,m_bInDrop(sal_False)
{}
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index fec6c53..4afbde7 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -45,7 +45,7 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn, bool _bCase)
, getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
, getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
, getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)))
- , sal_False
+ , false
, getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))
, _bCase
, getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME)))
@@ -84,7 +84,7 @@ OParseColumn::OParseColumn( const OUString& _Name,
_Scale,
_Type,
_IsAutoIncrement,
- sal_False,
+ false,
_IsCurrency,
_bCase,
_CatalogName,
@@ -202,7 +202,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUStr
getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
- sal_False,
+ false,
getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
_bCase,
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME))),
@@ -226,7 +226,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, bool _bCase
getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
- sal_False,
+ false,
getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
_bCase,
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME))),
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index d1afe33..2b06055 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1636,7 +1636,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
OSQLTable aReturnTable = new OTable(
NULL,
- sal_False,
+ false,
rTableName,
OUString("Table"),
OUString("New Created Table"),
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 586f5c4..a427c4d 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -56,8 +56,8 @@ namespace
::std::vector< ObjectIter > m_aElements; // hold the iterators which point to map
ObjectMap m_aNameMap; // hold the elements and a name
public:
- OHardRefMap(sal_Bool _bCase)
- : m_aNameMap(_bCase ? true : false)
+ OHardRefMap(bool _bCase)
+ : m_aNameMap(_bCase)
{
}
virtual ~OHardRefMap()
@@ -215,7 +215,7 @@ namespace
m_aElements[_nIndex]->second = _xObject;
}
- sal_Bool isCaseSensitive() const SAL_OVERRIDE
+ bool isCaseSensitive() const SAL_OVERRIDE
{
return m_aNameMap.key_comp().isCaseSensitive();
}
@@ -228,11 +228,11 @@ IObjectCollection::~IObjectCollection() {}
IMPLEMENT_SERVICE_INFO(OCollection,"com.sun.star.sdbcx.VContainer" , "com.sun.star.sdbcx.Container")
OCollection::OCollection(::cppu::OWeakObject& _rParent
- , sal_Bool _bCase
+ , bool _bCase
, ::osl::Mutex& _rMutex
, const TStringVector &_rVector
- , sal_Bool _bUseIndexOnly
- , sal_Bool _bUseHardRef)
+ , bool _bUseIndexOnly
+ , bool _bUseHardRef)
:m_aContainerListeners(_rMutex)
,m_aRefreshListeners(_rMutex)
,m_rParent(_rParent)
@@ -386,7 +386,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >&
ODescriptor* pDescriptor = ODescriptor::getImplementation( xNewlyCreated );
if ( pDescriptor )
- pDescriptor->setNew( sal_False );
+ pDescriptor->setNew( false );
sName = getNameForObject( xNewlyCreated );
if ( !m_pElements->exists( sName ) ) // this may happen when the drived class included it itself
@@ -418,7 +418,7 @@ void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, In
dropImpl(index);
}
-void OCollection::dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop)
+void OCollection::dropImpl(sal_Int32 _nIndex, bool _bReallyDrop)
{
OUString elementName = m_pElements->getName(_nIndex);
@@ -548,7 +548,7 @@ ObjectType OCollection::getObject(sal_Int32 _nIndex)
{
try
{
- dropImpl(_nIndex,sal_False);
+ dropImpl(_nIndex,false);
}
catch(const Exception& )
{
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 139c750..a22b543 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -56,16 +56,16 @@ sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) thro
return cppu::supportsService(this, _rServiceName);
}
-OColumn::OColumn(sal_Bool _bCase)
+OColumn::OColumn(bool _bCase)
:OColumnDescriptor_BASE(m_aMutex)
- ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase,sal_True)
+ ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase,true)
,m_IsNullable(ColumnValue::NULLABLE)
,m_Precision(0)
,m_Scale(0)
,m_Type(0)
- ,m_IsAutoIncrement(sal_False)
- ,m_IsRowVersion(sal_False)
- ,m_IsCurrency(sal_False)
+ ,m_IsAutoIncrement(false)
+ ,m_IsRowVersion(false)
+ ,m_IsCurrency(false)
{
construct();
}
@@ -78,10 +78,10 @@ OColumn::OColumn( const OUString& _Name,
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName)
@@ -202,7 +202,7 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor( ) throw(Runti
m_CatalogName,
m_SchemaName,
m_TableName);
- pNewColumn->setNew(sal_True);
+ pNewColumn->setNew(true);
return pNewColumn;
}
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 751b696..a911b0b 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -36,7 +36,7 @@ namespace connectivity
// = ODescriptor
- ODescriptor::ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew)
+ ODescriptor::ODescriptor(::cppu::OBroadcastHelper& _rBHelper, bool _bCase, bool _bNew)
:ODescriptor_PBASE(_rBHelper)
,m_aCase(_bCase)
,m_bNew(_bNew)
@@ -95,10 +95,10 @@ namespace connectivity
}
- sal_Bool ODescriptor::isNew( const Reference< XInterface >& _rxDescriptor )
+ bool ODescriptor::isNew( const Reference< XInterface >& _rxDescriptor )
{
ODescriptor* pImplementation = getImplementation( _rxDescriptor );
- return pImplementation != NULL ? pImplementation->isNew() : sal_False;
+ return pImplementation && pImplementation->isNew();
}
@@ -125,7 +125,7 @@ namespace connectivity
}
- void ODescriptor::setNew(sal_Bool _bNew)
+ void ODescriptor::setNew(bool _bNew)
{
m_bNew = _bNew;
}
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index ad02fef..b1eeac8 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -38,13 +38,13 @@ using namespace ::com::sun::star::beans;
IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Group");
-OGroup::OGroup(sal_Bool _bCase) : OGroup_BASE(m_aMutex)
+OGroup::OGroup(bool _bCase) : OGroup_BASE(m_aMutex)
, ODescriptor(OGroup_BASE::rBHelper,_bCase)
, m_pUsers(NULL)
{
}
-OGroup::OGroup(const OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex)
+OGroup::OGroup(const OUString& _Name, bool _bCase) : OGroup_BASE(m_aMutex)
,ODescriptor(OGroup_BASE::rBHelper,_bCase)
,m_pUsers(NULL)
{
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 4de35b2..43c6167 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -61,21 +61,21 @@ sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw
return cppu::supportsService(this, _rServiceName);
}
-OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex)
- , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True)
- ,m_IsUnique(sal_False)
- ,m_IsPrimaryKeyIndex(sal_False)
- ,m_IsClustered(sal_False)
+OIndex::OIndex(bool _bCase) : ODescriptor_BASE(m_aMutex)
+ , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,true)
+ ,m_IsUnique(false)
+ ,m_IsPrimaryKeyIndex(false)
+ ,m_IsClustered(false)
,m_pColumns(NULL)
{
}
OIndex::OIndex( const OUString& _Name,
const OUString& _Catalog,
- sal_Bool _isUnique,
- sal_Bool _isPrimaryKeyIndex,
- sal_Bool _isClustered,
- sal_Bool _bCase) : ODescriptor_BASE(m_aMutex)
+ bool _isUnique,
+ bool _isPrimaryKeyIndex,
+ bool _isClustered,
+ bool _bCase) : ODescriptor_BASE(m_aMutex)
,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
,m_Catalog(_Catalog)
,m_IsUnique(_isUnique)
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 05025d8..d1b6dc1 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -49,27 +49,27 @@ sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName )
return cppu::supportsService(this, _rServiceName);
}
-OIndexColumn::OIndexColumn(sal_Bool _bCase) : OColumn(_bCase), m_IsAscending(sal_True)
+OIndexColumn::OIndexColumn(bool _bCase) : OColumn(_bCase), m_IsAscending(true)
{
construct();
}
-OIndexColumn::OIndexColumn( sal_Bool _IsAscending,
+OIndexColumn::OIndexColumn( bool _IsAscending,
const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
- sal_Int32 _IsNullable,
- sal_Int32 _Precision,
- sal_Int32 _Scale,
- sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
- const OUString& _CatalogName,
- const OUString& _SchemaName,
- const OUString& _TableName
+ sal_Int32 _IsNullable,
+ sal_Int32 _Precision,
+ sal_Int32 _Scale,
+ sal_Int32 _Type,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
+ const OUString& _CatalogName,
+ const OUString& _SchemaName,
+ const OUString& _TableName
) : OColumn(_Name,
_TypeName,
_DefaultValue,
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index a20cebf..af05f81 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -59,14 +59,14 @@ sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(:
return cppu::supportsService(this, _rServiceName);
}
-OKey::OKey(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex)
- , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True)
+OKey::OKey(bool _bCase) : ODescriptor_BASE(m_aMutex)
+ , ODescriptor(ODescriptor_BASE::rBHelper, _bCase, true)
, m_aProps(new KeyProperties())
, m_pColumns(NULL)
{
}
-OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase)
+OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps, bool _bCase)
: ODescriptor_BASE(m_aMutex)
,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
,m_aProps(_rProps)
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 0c60fef..fdbb9e2 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -50,7 +50,7 @@ sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) t
return cppu::supportsService(this, _rServiceName);
}
-OKeyColumn::OKeyColumn(sal_Bool _bCase) : OColumn(_bCase)
+OKeyColumn::OKeyColumn(bool _bCase) : OColumn(_bCase)
{
construct();
}
@@ -59,17 +59,17 @@ OKeyColumn::OKeyColumn( const OUString& _ReferencedColumn,
const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
- sal_Int32 _IsNullable,
- sal_Int32 _Precision,
- sal_Int32 _Scale,
- sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
- const OUString& _CatalogName,
- const OUString& _SchemaName,
- const OUString& _TableName
+ sal_Int32 _IsNullable,
+ sal_Int32 _Precision,
+ sal_Int32 _Scale,
+ sal_Int32 _Type,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
+ const OUString& _CatalogName,
+ const OUString& _SchemaName,
+ const OUString& _TableName
) : OColumn(_Name,
_TypeName,
_DefaultValue,
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index ff1d3eb..2a2fe35 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -65,9 +65,9 @@ sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw
}
OTable::OTable(OCollection* _pTables,
- sal_Bool _bCase)
+ bool _bCase)
: OTableDescriptor_BASE(m_aMutex)
- ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase,sal_True)
+ ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase,true)
,m_pKeys(NULL)
,m_pColumns(NULL)
,m_pIndexes(NULL)
@@ -76,7 +76,7 @@ OTable::OTable(OCollection* _pTables,
}
OTable::OTable( OCollection* _pTables,
- sal_Bool _bCase,
+ bool _bCase,
const OUString& _Name, const OUString& _Type,
const OUString& _Description,const OUString& _SchemaName,
const OUString& _CatalogName) : OTableDescriptor_BASE(m_aMutex)
@@ -229,7 +229,7 @@ Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor( ) throw(Runtim
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
OTable* pTable = new OTable(m_pTables,isCaseSensitive(),m_Name,m_Type,m_Description,m_SchemaName,m_CatalogName);
- pTable->setNew(sal_True);
+ pTable->setNew(true);
return pTable;
}
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 9119cbf..31fc797 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -39,13 +39,13 @@ using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(OUser,"com.sun.star.sdbcx.VUser","com.sun.star.sdbcx.User");
-OUser::OUser(sal_Bool _bCase) : OUser_BASE(m_aMutex)
- , ODescriptor(OUser_BASE::rBHelper,_bCase,sal_True)
+OUser::OUser(bool _bCase) : OUser_BASE(m_aMutex)
+ , ODescriptor(OUser_BASE::rBHelper,_bCase,true)
, m_pGroups(NULL)
{
}
-OUser::OUser(const OUString& _Name,sal_Bool _bCase) : OUser_BASE(m_aMutex)
+OUser::OUser(const OUString& _Name, bool _bCase) : OUser_BASE(m_aMutex)
,ODescriptor(OUser_BASE::rBHelper,_bCase)
,m_pGroups(NULL)
{
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 29bd8c1..acae77f 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View");
-OView::OView(sal_Bool _bCase,
+OView::OView(bool _bCase,
const OUString& _Name,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
sal_Int32 _CheckOption,
@@ -52,8 +52,8 @@ OView::OView(sal_Bool _bCase,
construct();
}
-OView::OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData)
- : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase,sal_True)
+OView::OView(bool _bCase, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData)
+ : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper, _bCase, true)
,m_xMetaData(_xMetaData)
{
construct();
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 01c1c04..1049274 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -60,7 +60,7 @@ protected:
virtual void impl_refresh() throw(RuntimeException) SAL_OVERRIDE;
virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE;
public:
- OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< OUString>()){}
+ OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, ::std::vector< OUString>()){}
};
void OEmptyCollection::impl_refresh() throw(RuntimeException)
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index c282ed0..95ef85e 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -83,7 +83,7 @@ namespace connectivity
virtual ObjectType getObject(sal_Int32 _nIndex) = 0;
virtual ObjectType getObject(const OUString& columnName) = 0;
virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0;
- virtual sal_Bool isCaseSensitive() const = 0;
+ virtual bool isCaseSensitive() const = 0;
};
// OCollection
@@ -100,7 +100,7 @@ namespace connectivity
protected:
::cppu::OWeakObject& m_rParent; // parent of the collection
::osl::Mutex& m_rMutex; // mutex of the parent
- sal_Bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed
+ bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed
// the implementing class should refresh their elements
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0;
@@ -146,11 +146,11 @@ namespace connectivity
ObjectType cloneDescriptor( const ObjectType& _descriptor );
OCollection(::cppu::OWeakObject& _rParent,
- sal_Bool _bCase,
+ bool _bCase,
::osl::Mutex& _rMutex,
const TStringVector &_rVector,
- sal_Bool _bUseIndexOnly = sal_False,
- sal_Bool _bUseHardRef = sal_True);
+ bool _bUseIndexOnly = false,
+ bool _bUseHardRef = true);
/** clear the name map
<p>Does <em>not</em> dispose the objects hold by the collection.</p>
@@ -181,7 +181,7 @@ namespace connectivity
DECLARE_SERVICE_INFO();
void reFill(const TStringVector &_rVector);
- inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
+ inline bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
void renameObject(const OUString& _sOldName, const OUString& _sNewName);
// only the name is identical to ::cppu::OComponentHelper
@@ -226,7 +226,7 @@ namespace connectivity
private:
void notifyElementRemoved(const OUString& _sName);
void disposeElements();
- void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True);
+ void dropImpl(sal_Int32 _nIndex, bool _bReallyDrop = true);
};
}
}
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 6f97e62..20c2bd6 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -50,22 +50,22 @@ namespace connectivity
public ODescriptor
{
protected:
- OUString m_TypeName;
- OUString m_Description;
- OUString m_DefaultValue;
+ OUString m_TypeName;
+ OUString m_Description;
+ OUString m_DefaultValue;
sal_Int32 m_IsNullable;
sal_Int32 m_Precision;
sal_Int32 m_Scale;
sal_Int32 m_Type;
- sal_Bool m_IsAutoIncrement;
- sal_Bool m_IsRowVersion;
- sal_Bool m_IsCurrency;
+ bool m_IsAutoIncrement;
+ bool m_IsRowVersion;
+ bool m_IsCurrency;
- OUString m_CatalogName;
- OUString m_SchemaName;
- OUString m_TableName;
+ OUString m_CatalogName;
+ OUString m_SchemaName;
+ OUString m_TableName;
using OColumnDescriptor_BASE::rBHelper;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
@@ -76,7 +76,7 @@ namespace connectivity
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
virtual void SAL_CALL release() throw() SAL_OVERRIDE;
- OColumn( sal_Bool _bCase);
+ OColumn( bool _bCase);
OColumn( const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
@@ -85,10 +85,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index f5358da..1975fae 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -54,18 +54,18 @@ namespace connectivity
private:
comphelper::UStringMixEqual m_aCase;
- sal_Bool m_bNew;
+ bool m_bNew;
public:
- ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew = sal_False);
+ ODescriptor(::cppu::OBroadcastHelper& _rBHelper, bool _bCase, bool _bNew = false);
virtual ~ODescriptor();
- sal_Bool isNew() const { return m_bNew; }
- sal_Bool getNew() const { return m_bNew; }
- virtual void setNew(sal_Bool _bNew);
+ bool isNew() const { return m_bNew; }
+ bool getNew() const { return m_bNew; }
+ virtual void setNew(bool _bNew);
- sal_Bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); }
+ bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); }
virtual void construct();
@@ -74,7 +74,7 @@ namespace connectivity
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
// compare
- inline sal_Bool operator == ( const OUString & _rRH )
+ inline bool operator == ( const OUString & _rRH )
{
return m_aCase(m_Name,_rRH);
}
@@ -85,7 +85,7 @@ namespace connectivity
static ODescriptor* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSomeComp );
// retrieves the ODescriptor implementation of a given UNO component, and returns its ->isNew flag
- static sal_Bool isNew( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDescriptor );
+ static bool isNew( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDescriptor );
};
}
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index bbda1cc..fabb75a 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -64,8 +64,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OGroup(sal_Bool _bCase);
- OGroup( const OUString& _Name,sal_Bool _bCase);
+ OGroup(bool _bCase);
+ OGroup( const OUString& _Name, bool _bCase);
virtual ~OGroup();
DECLARE_SERVICE_INFO();
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 2087f48..f5e85ed 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -52,10 +52,10 @@ namespace connectivity
public OIndex_BASE
{
protected:
- OUString m_Catalog;
- sal_Bool m_IsUnique;
- sal_Bool m_IsPrimaryKeyIndex;
- sal_Bool m_IsClustered;
+ OUString m_Catalog;
+ bool m_IsUnique;
+ bool m_IsPrimaryKeyIndex;
+ bool m_IsClustered;
OCollection* m_pColumns;
@@ -65,13 +65,13 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OIndex(sal_Bool _bCase);
+ OIndex(bool _bCase);
OIndex( const OUString& _Name,
const OUString& _Catalog,
- sal_Bool _isUnique,
- sal_Bool _isPrimaryKeyIndex,
- sal_Bool _isClustered,
- sal_Bool _bCase);
+ bool _isUnique,
+ bool _isPrimaryKeyIndex,
+ bool _isClustered,
+ bool _bCase);
virtual ~OIndex( );
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index c70670e..a2eaf61 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -34,12 +34,12 @@ namespace connectivity
public OColumn, public OIndexColumn_PROP
{
protected:
- sal_Bool m_IsAscending;
+ bool m_IsAscending;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OIndexColumn( sal_Bool _bCase);
- OIndexColumn( sal_Bool _IsAscending,
+ OIndexColumn( bool _bCase);
+ OIndexColumn( bool _IsAscending,
const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
@@ -47,10 +47,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 94bb1a6..f135a77 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -78,14 +78,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OKey(sal_Bool _bCase);
- OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
- /*OKey( const OUString& _Name,
- const OUString& _ReferencedTable,
- sal_Int32 _Type,
- sal_Int32 _UpdateRule,
- sal_Int32 _DeleteRule,
- sal_Bool _bCase);*/
+ OKey(bool _bCase);
+ OKey(const OUString& _Name,const TKeyProperties& _rProps,bool _bCase);
virtual ~OKey( );
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index dcbc416..afab306 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -38,7 +38,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OKeyColumn(sal_Bool _bCase);
+ OKeyColumn(bool _bCase);
OKeyColumn( const OUString& _ReferencedColumn,
const OUString& _Name,
const OUString& _TypeName,
@@ -47,10 +47,10 @@ namespace connectivity
sal_Int32 _Precision,
sal_Int32 _Scale,
sal_Int32 _Type,
- sal_Bool _IsAutoIncrement,
- sal_Bool _IsRowVersion,
- sal_Bool _IsCurrency,
- sal_Bool _bCase,
+ bool _IsAutoIncrement,
+ bool _IsRowVersion,
+ bool _IsCurrency,
+ bool _bCase,
const OUString& _CatalogName,
const OUString& _SchemaName,
const OUString& _TableName);
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 609d0f9..2e0f86a 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -85,9 +85,9 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
OTable( OCollection* _pTables,
- sal_Bool _bCase);
+ bool _bCase);
OTable( OCollection* _pTables,
- sal_Bool _bCase,
+ bool _bCase,
const OUString& _Name,
const OUString& _Type,
const OUString& _Description = OUString(),
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 38f3f44..125ff4a 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -61,8 +61,8 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
public:
- OUser(sal_Bool _bCase);
- OUser(const OUString& _Name,sal_Bool _bCase);
+ OUser(bool _bCase);
+ OUser(const OUString& _Name,bool _bCase);
virtual ~OUser( );
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 0e1fd2e..b97c273 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -65,8 +65,8 @@ namespace connectivity
public:
DECLARE_SERVICE_INFO();
- OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
- OView( sal_Bool _bCase,
+ OView(bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
+ OView( bool _bCase,
const OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
sal_Int32 _nCheckOption = 0,
commit 73c1ac010c544e836cfff4c53542a2bb37630c9f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 31 16:58:07 2014 +0200
connectivity: sal_Bool->bool
Change-Id: Ia45f9776e0b27720647c664541a41b5f46eedc37
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 055dec7..83fa8e4 100644
--- a/connectivity/source/commontools/filtermanager.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list