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 /connectivity | |
parent | 2c7bef7b8d71a7ce435695ef6d10f443e7bf26f0 (diff) |
connectivity: sal_Bool->bool and fix method name
Convert method name
getBoleanComparisonPredicate
to
getBooleanComparisonPredicate
Change-Id: I00c726b1fecd8352dc49f2af98c3ae3c799ef424
Diffstat (limited to 'connectivity')
18 files changed, 59 insertions, 59 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 7f369eee1163..da7d7226b389 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -188,17 +188,17 @@ sal_Bool isCharOk(sal_Unicode c,const OUString& _rSpecials) } -sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials) +bool isValidSQLName(const OUString& rName,const OUString& _rSpecials) { // Test for correct naming (in SQL sense) // This is important for table names for example const sal_Unicode* pStr = rName.getStr(); if (*pStr > 127 || isdigit(*pStr)) - return sal_False; + return false; for (; *pStr; ++pStr ) if(!isCharOk(*pStr,_rSpecials)) - return sal_False; + return false; if ( !rName.isEmpty() && ( (rName.toChar() == '_') @@ -207,13 +207,13 @@ sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials) ) ) ) - return sal_False; + return false; // the SQL-Standard requires the first character to be an alphabetic character, which // isn't easy to decide in UniCode ... // So we just prohibit the characters which already lead to problems .... // 11.04.00 - 74902 - FS - return sal_True; + return true; } // Creates a new name if necessary diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 0bcc9509133f..c5669adf33f4 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::uno; -OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote, +OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool bQuote, const Reference< XTypeConverter >& _rxTypeConverter) { OUStringBuffer aRet; diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index acf70f219d08..27c7e16dd04b 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -149,7 +149,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const dbtools::qualifiedNameComponents(m_pTable->getMetaData(),m_pTable->getName(),aCatalog,aSchema,aTable,::dbtools::eInDataManipulation); OUString aComposedName; - aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions); + aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable, true, ::dbtools::eInIndexDefinitions); if (!_rForName.isEmpty() ) { aSql.append( ::dbtools::quoteName( aQuote, _rForName ) ); @@ -230,7 +230,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementNam OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); OUString sIndexName,sTemp; - sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions ); + sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, true, ::dbtools::eInIndexDefinitions ); aSql += sIndexName + " ON " + aComposedName; diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index e026f6ce8696..14454ab1570f 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -394,7 +394,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames) if ( pKeyProps.get() ) m_pImpl->m_aKeys.insert(TKeyMap::value_type(sOldFKName,pKeyProps)); - const OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation); + const OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,false,::dbtools::eInDataManipulation); pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule)); pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); _rNames.push_back(sFkName); @@ -517,10 +517,10 @@ void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); OUString sComposedName; - sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation); + sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,true,::dbtools::eInDataManipulation); sSql += sComposedName + " TO "; - sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation); + sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,true,::dbtools::eInDataManipulation); sSql += sComposedName; Reference< XStatement > xStmt = m_pImpl->m_xConnection->createStatement( ); @@ -563,7 +563,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception) { OUString sComposedName; - sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_False,::dbtools::eInDataManipulation); + sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,false,::dbtools::eInDataManipulation); return sComposedName; } diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index d004fa074790..e01f1770acf5 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -45,8 +45,8 @@ namespace dbtools OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection) :m_xRowSet( _rxRowSet ) - ,m_bRSListening( sal_False ) - ,m_bPropertyListening( sal_False ) + ,m_bRSListening( false ) + ,m_bPropertyListening( false ) { Reference< XPropertySet > xProps(_rxRowSet, UNO_QUERY); OSL_ENSURE(xProps.is(), "OAutoConnectionDisposer::OAutoConnectionDisposer: invalid rowset (no XPropertySet)!"); @@ -72,7 +72,7 @@ namespace dbtools try { _rxRowSet->addPropertyChangeListener( getActiveConnectionPropertyName(), this ); - m_bPropertyListening = sal_True; + m_bPropertyListening = true; } catch( const Exception& ) { @@ -92,7 +92,7 @@ namespace dbtools if ( _rxEventSource.is() ) { _rxEventSource->removePropertyChangeListener( getActiveConnectionPropertyName(), this ); - m_bPropertyListening = sal_False; + m_bPropertyListening = false; } } catch( const Exception& ) @@ -114,7 +114,7 @@ namespace dbtools { OSL_FAIL( "OAutoConnectionDisposer::startRowSetListening: caught an exception!" ); } - m_bRSListening = sal_True; + m_bRSListening = true; } @@ -129,7 +129,7 @@ namespace dbtools { OSL_FAIL( "OAutoConnectionDisposer::stopRowSetListening: caught an exception!" ); } - m_bRSListening = sal_False; + m_bRSListening = false; } diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index eddaea17ce2a..99a5b62d8fd4 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -70,9 +70,9 @@ namespace dbtools } - sal_Bool OCharsetMap::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const + bool OCharsetMap::approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const { - sal_Bool bIsMimeEncoding = 0 != ( _rInfo.Flags & RTL_TEXTENCODING_INFO_MIME ); + bool bIsMimeEncoding = 0 != ( _rInfo.Flags & RTL_TEXTENCODING_INFO_MIME ); OSL_ENSURE( !bIsMimeEncoding || rtl_getMimeCharsetFromTextEncoding( _eEncoding ), "OCharsetMap::OCharsetMap: inconsistence in rtl!" ); OSL_UNUSED( _eEncoding ); diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 176239cc4e1c..2056a4435f96 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -158,7 +158,7 @@ void SQLExceptionInfo::implDetermineType() } -sal_Bool SQLExceptionInfo::isKindOf(TYPE _eType) const +bool SQLExceptionInfo::isKindOf(TYPE _eType) const { switch (_eType) { @@ -171,7 +171,7 @@ sal_Bool SQLExceptionInfo::isKindOf(TYPE _eType) const case UNDEFINED: return (m_eType == UNDEFINED); } - return sal_False; + return false; } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 0a4c8c1b9874..a08b85526fd4 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -145,7 +145,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, sal_Int32 _nScale, - sal_Bool _bIsCurrency, + bool _bIsCurrency, const Reference< XNumberFormatTypes >& _xTypes, const Locale& _rLocale) { @@ -808,7 +808,7 @@ namespace static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName, - sal_Bool _bQuote, EComposeRule _eComposeRule ) + bool _bQuote, EComposeRule _eComposeRule ) { OSL_ENSURE(_rxMetaData.is(), "impl_doComposeTableName : invalid meta data !"); if ( !_rxMetaData.is() ) @@ -861,7 +861,7 @@ OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta { OUString sCatalog, sSchema, sTable; qualifiedNameComponents(_rxMeta,_rName,sCatalog,sSchema,sTable,_eComposeRule); - return impl_doComposeTableName( _rxMeta, sCatalog, sSchema, sTable, sal_True, _eComposeRule ); + return impl_doComposeTableName( _rxMeta, sCatalog, sSchema, sTable, true, _eComposeRule ); } void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule) @@ -912,7 +912,7 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa Reference< XNumberFormatsSupplier> getNumberFormats( const Reference< XConnection>& _rxConn, - sal_Bool _bAlloweDefault, + bool _bAlloweDefault, const Reference< XComponentContext>& _rxContext) { // ask the parent of the connection (should be an DatabaseAccess) @@ -1197,17 +1197,17 @@ catch(const Exception&) } } -sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet) +bool canInsert(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::INSERT) != 0)); } -sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) +bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::UPDATE) != 0)); } -sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet) +bool canDelete(const Reference< XPropertySet>& _rxCursorSet) { return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::DELETE) != 0)); } @@ -1302,7 +1302,7 @@ OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName, - sal_Bool _bQuote, + bool _bQuote, EComposeRule _eComposeRule) { return impl_doComposeTableName( _rxMetaData, _rCatalog, _rSchema, _rName, _bQuote, _eComposeRule ); @@ -1311,8 +1311,8 @@ OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) { - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseCatalogInSelect" ), sal_True ); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseSchemaInSelect" ), sal_True ); + bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseCatalogInSelect" ), true ); + bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseSchemaInSelect" ), true ); return impl_doComposeTableName( _rxConnection->getMetaData(), @@ -1396,7 +1396,7 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32 return nSearchFlag; } -OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, sal_Bool _bStartWithNumber ) +OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, bool _bStartWithNumber ) { ::std::set< OUString > aUsedNames; ::std::copy( @@ -1418,7 +1418,7 @@ OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& return sName; } -OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const OUString& _rBaseName,sal_Bool _bStartWithNumber) +OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const OUString& _rBaseName, bool _bStartWithNumber) { Sequence< OUString > aElementNames; @@ -1933,7 +1933,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams, } } -void getBoleanComparisonPredicate( const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, +void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bValue, const sal_Int32 _nBooleanComparisonMode, OUStringBuffer& _out_rSQLPredicate ) { switch ( _nBooleanComparisonMode ) diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 2dd7676dd275..f2fc329a0053 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -216,7 +216,7 @@ OUString createStandardCreateStatement(const Reference< XPropertySet >& descript descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; - sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); + sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInTableDefinitions ); if ( sComposedName.isEmpty() ) ::dbtools::throwFunctionSequenceException(_xConnection); @@ -331,7 +331,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor, sSchema, sTable, ::dbtools::eInDataManipulation); - sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); + sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInTableDefinitions ); if ( sComposedName.isEmpty() ) @@ -400,10 +400,10 @@ namespace const OUString& _aTable, const OUString& _rQueryName, const OUString& _rName, - sal_Bool _bCase, - sal_Bool _bQueryForInfo, - sal_Bool _bIsAutoIncrement, - sal_Bool _bIsCurrency, + bool _bCase, + bool _bQueryForInfo, + bool _bIsAutoIncrement, + bool _bIsCurrency, sal_Int32 _nDataType) { Reference<XPropertySet> xProp; @@ -525,10 +525,10 @@ namespace Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable, const Reference<XConnection>& _xConnection, const OUString& _rName, - sal_Bool _bCase, - sal_Bool _bQueryForInfo, - sal_Bool _bIsAutoIncrement, - sal_Bool _bIsCurrency, + bool _bCase, + bool _bQueryForInfo, + bool _bIsAutoIncrement, + bool _bIsCurrency, sal_Int32 _nDataType) { Reference<XPropertySet> xProp; @@ -629,9 +629,9 @@ bool getDataSourceSetting( const Reference< XInterface >& _rxDataSource, const s return getDataSourceSetting( _rxDataSource, sAsciiSettingsName,_rSettingsValue ); } -sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const OUString& _sProperty,sal_Bool _bDefault) +bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp, const OUString& _sProperty, bool _bDefault) { - sal_Bool bEnabled = _bDefault; + bool bEnabled = _bDefault; try { Reference< XPropertySet> xProp(findDataSource(_xProp),UNO_QUERY); diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 99ea133d7c5a..d70f014621bc 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -196,7 +196,7 @@ namespace dbtools { // get the number formats supplier of the connection of the form Reference< XConnection > xConnection( getConnection( i_rRowSet ), UNO_QUERY_THROW ); - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, sal_True, i_rContext ), UNO_SET_THROW ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, true, i_rContext ), UNO_SET_THROW ); // create a number formatter for it xNumberFormatter.set( NumberFormatter::create( i_rContext ), UNO_QUERY_THROW ); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 8715ad5f32c1..03373a9b6762 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -116,7 +116,7 @@ namespace dbtools ); } - Reference< XNumberFormatsSupplier > xNumberFormats = ::dbtools::getNumberFormats( m_xConnection, sal_True ); + Reference< XNumberFormatsSupplier > xNumberFormats = ::dbtools::getNumberFormats( m_xConnection, true ); if ( !xNumberFormats.is() ) ::comphelper::disposeComponent( m_xFormatter ); else diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 7eea65f0cd8f..ff96a9abe38d 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -315,7 +315,7 @@ OUString OHSQLTable::getAlterTableColumnPart() { OUString sSql( "ALTER TABLE " ); - OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); + OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, true, ::dbtools::eInTableDefinitions ) ); sSql += sComposedName; return sSql; @@ -386,9 +386,9 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); sSql += - ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) + ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, true, ::dbtools::eInDataManipulation ) + " RENAME TO " - + ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ); + + ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, true, ::dbtools::eInDataManipulation ); executeStatement(sSql); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index eed4ffa44d7b..abd6b81f406b 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -138,7 +138,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString& _sElementName) aSql += "TABLE "; OUString sComposedName( - ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); + ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInDataManipulation ) ); aSql += sComposedName; Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 786ee3a0d05e..defc31805a04 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -337,7 +337,7 @@ OUString OMySQLTable::getAlterTableColumnPart() OUString sSql( "ALTER TABLE " ); OUString sComposedName( - ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); + ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, true, ::dbtools::eInTableDefinitions ) ); sSql += sComposedName; return sSql; diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index c48a998eaba7..1ac19ec7ba00 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -143,7 +143,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString& _sElementName) aSql += "TABLE "; OUString sComposedName( - ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); + ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, true, ::dbtools::eInDataManipulation ) ); aSql += sComposedName; Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 656ff23e5c10..d1afe3318db0 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -300,7 +300,7 @@ namespace sCatalog, sSchema, sName, - sal_False, + false, ::dbtools::eInDataManipulation ); } @@ -458,7 +458,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ aCatalog.hasValue() ? ::comphelper::getString(aCatalog) : OUString(), aSchema, aTableName, - sal_False, + false, ::dbtools::eInDataManipulation); // if there is no alias for the table name assign the orignal name to it diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index c8fe7d1bc273..9af5e221e593 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -198,7 +198,7 @@ OUString OCatalog::buildName(const Reference< XRow >& _xRow) sTable = OUString(); OUString sComposedName( - ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ) ); + ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, false, ::dbtools::eInDataManipulation ) ); return sComposedName; } diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index fd647116518e..29bd8c167bdc 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -107,7 +107,7 @@ OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException { OUString sComposedName; if(m_xMetaData.is()) - sComposedName = ::dbtools::composeTableName( m_xMetaData, m_CatalogName, m_SchemaName, m_Name, sal_False, ::dbtools::eInDataManipulation ); + sComposedName = ::dbtools::composeTableName( m_xMetaData, m_CatalogName, m_SchemaName, m_Name, false, ::dbtools::eInDataManipulation ); else { Any aValue; |