From 39d3f2bb3a7016042e51e4a270814a99f7e62221 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 1 Apr 2014 07:23:45 +0200 Subject: connectivity: sal_Bool->bool Change-Id: Ice855d69c70d4f5fc119ddf1ddebf18ee6add270 --- 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 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'include') 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 #include -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& _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& _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& _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) -- cgit