diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-31 16:46:08 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-01 07:38:08 +0200 |
commit | 3194d22a24f102d2a8a617f88b162545a0395447 (patch) | |
tree | 3a4f20580f424ff774fc810f154e7296ffced21c /include/connectivity | |
parent | 2c7bef7b8d71a7ce435695ef6d10f443e7bf26f0 (diff) |
connectivity: sal_Bool->bool and fix method name
Convert method name
getBoleanComparisonPredicate
to
getBooleanComparisonPredicate
Change-Id: I00c726b1fecd8352dc49f2af98c3ae3c799ef424
Diffstat (limited to 'include/connectivity')
-rw-r--r-- | include/connectivity/conncleanup.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/dbcharset.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbconversion.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbexception.hxx | 6 | ||||
-rw-r--r-- | include/connectivity/dbtools.hxx | 38 |
5 files changed, 28 insertions, 28 deletions
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index ea271b308a0d..265f058e25bf 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -43,8 +43,8 @@ namespace dbtools ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOriginalConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // needed to add as listener - sal_Bool m_bRSListening : 1; // true when we're listening on rowset - sal_Bool m_bPropertyListening : 1; // true when we're listening for property changes + bool m_bRSListening : 1; // true when we're listening on rowset + bool m_bPropertyListening : 1; // true when we're listening for property changes public: /** constructs an object @@ -74,11 +74,11 @@ namespace dbtools void startRowSetListening(); void stopRowSetListening(); - sal_Bool isRowSetListening() const { return m_bRSListening; } + bool isRowSetListening() const { return m_bRSListening; } void startPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps ); void stopPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxEventSource ); - sal_Bool isPropertyListening() const { return m_bPropertyListening; } + bool isPropertyListening() const { return m_bPropertyListening; } }; diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index 09ac780ff0d7..9046686ce0a6 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -91,7 +91,7 @@ namespace dbtools void lateConstruct(); inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } - virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; }; diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 887147b48048..62ec97f69f3e 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -142,7 +142,7 @@ namespace dbtools // return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d.%09d static OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime); // return the any in an sql standard format - static OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote, + static OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, bool bQuote, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter); /** converts a Unicode string into a 8-bit string, using the given encoding diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 9882d7ef8492..74b548c96289 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -127,9 +127,9 @@ public: const SQLExceptionInfo& operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent); const SQLExceptionInfo& operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException); - sal_Bool isKindOf(TYPE _eType) const; + bool isKindOf(TYPE _eType) const; // not just a simple comparisation ! e.g. getType() == SQL_CONTEXT implies isKindOf(SQL_EXCEPTION) == sal_True ! - sal_Bool isValid() const { return m_eType != UNDEFINED; } + bool isValid() const { return m_eType != UNDEFINED; } TYPE getType() const { return m_eType; } operator const ::com::sun::star::sdbc::SQLException* () const; @@ -177,7 +177,7 @@ public: /** determines whether there are more elements in the exception chain */ - sal_Bool hasMoreElements() const { return ( m_pCurrent != NULL ); } + bool hasMoreElements() const { return ( m_pCurrent != NULL ); } /** returns the type of the current element in the exception chain */ diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 531a4b5d8a09..2e1a8fadd3f1 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -104,7 +104,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, sal_Int32 _nScale, - sal_Bool _bIsCurrency, + bool _bIsCurrency, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes, const ::com::sun::star::lang::Locale& _rLocale); @@ -340,9 +340,9 @@ namespace dbtools instead of spreading this knowledge through all callers. */ OOO_DLLPUBLIC_DBTOOLS - sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp - ,const OUString& _sProperty, - sal_Bool _bDefault = sal_False); + bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp, + const OUString& _sProperty, + bool _bDefault = false); /** retrieves a particular indirect data source setting @@ -405,7 +405,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, - sal_Bool _bAllowDefault = sal_False, + bool _bAllowDefault = false, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>() ); @@ -436,15 +436,15 @@ namespace dbtools /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT @param _rxCursorSet the property set */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE @param _rxCursorSet the property set */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE @param _rxCursorSet the property set */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules @@ -453,7 +453,7 @@ namespace dbtools const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName, - sal_Bool _bQuote, + bool _bQuote, EComposeRule _eComposeRule); /** composes a table name for usage in a SELECT statement @@ -512,14 +512,14 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, const OUString& _rBaseName, - sal_Bool _bStartWithNumber = sal_True); + bool _bStartWithNumber = true); /** creates a unique name which is not already used in the given name array */ OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName( const ::com::sun::star::uno::Sequence< OUString >& _rNames, const OUString& _rBaseName, - sal_Bool _bStartWithNumber = sal_True + bool _bStartWithNumber = true ); /** create a name which is a valid SQL 92 identifier name @@ -537,7 +537,7 @@ namespace dbtools @see convertName2SQLName */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const OUString& _rName, const OUString& _rSpecials ); + OOO_DLLPUBLIC_DBTOOLS bool isValidSQLName( const OUString& _rName, const OUString& _rSpecials ); OOO_DLLPUBLIC_DBTOOLS void showError( const SQLExceptionInfo& _rInfo, @@ -714,10 +714,10 @@ namespace dbtools createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& _rName, - sal_Bool _bCase, - sal_Bool _bQueryForInfo = sal_True, - sal_Bool _bIsAutoIncrement = sal_False, - sal_Bool _bIsCurrency = sal_False, + bool _bCase, + bool _bQueryForInfo = true, + bool _bIsAutoIncrement = false, + bool _bIsCurrency = false, sal_Int32 _nDataType = com::sun::star::sdbc::DataType::OTHER); /** tries to locate the corresponding DataDefinitionSupplier for the given url and connection @@ -751,7 +751,7 @@ namespace dbtools const OUString& _sSchema, const OUString& _sTable); - typedef ::std::pair<sal_Bool,sal_Bool> TBoolPair; + typedef ::std::pair<bool,bool> TBoolPair; typedef ::std::pair< TBoolPair,sal_Int32 > ColumnInformation; typedef ::std::multimap< OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; /** collects the information about auto increment, currency and data type for the given column name. @@ -784,9 +784,9 @@ namespace dbtools @param _out_rSQLPredicate the buffer to which the comparison predicate will be appended */ - OOO_DLLPUBLIC_DBTOOLS void getBoleanComparisonPredicate( + OOO_DLLPUBLIC_DBTOOLS void getBooleanComparisonPredicate( const OUString& _rExpression, - const sal_Bool _bValue, + const bool _bValue, const sal_Int32 _nBooleanComparisonMode, OUStringBuffer& _out_rSQLPredicate ); |