diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-10-30 21:44:13 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-30 21:44:13 +0100 |
commit | 52e672dbfa8e34b3929783267df56282d514e058 (patch) | |
tree | c2cc9fb00327194e49eaa29686dffa209e8254a7 | |
parent | f5f1a496ef25c68550155ad5423f6918f5363a3a (diff) |
Use RTL_CONSTASCII_USTRINGPARAM
-rw-r--r-- | dbaccess/source/core/api/CacheSet.cxx | 20 | ||||
-rw-r--r-- | dbaccess/source/core/api/FilteredContainer.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 50 | ||||
-rw-r--r-- | dbaccess/source/core/api/OptimisticSet.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSet.cxx | 10 | ||||
-rw-r--r-- | dbaccess/source/core/api/callablestatement.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/column.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/datacolumn.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/definitioncolumn.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/core/api/preparedstatement.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/querydescriptor.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/resultcolumn.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/resultset.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/statement.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/tablecontainer.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/viewcontainer.cxx | 2 |
16 files changed, 60 insertions, 60 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 847792bcc..56b045987 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -173,9 +173,9 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti fillTableName(xSet); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" ( ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( "))); // set values and column names - ::rtl::OUStringBuffer aValues = ::rtl::OUString::createFromAscii(" VALUES ( "); + ::rtl::OUStringBuffer aValues = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( ")); static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aComma(RTL_CONSTASCII_USTRINGPARAM(",")); @@ -248,8 +248,8 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow ::rtl::OUString aColumnName; - static ::rtl::OUString aPara = ::rtl::OUString::createFromAscii("?,"); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString aQuote = getIdentifierQuoteString(); @@ -304,9 +304,9 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("UPDATE "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE ")); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" SET ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET "))); // list all cloumns that should be set ::rtl::OUStringBuffer aCondition; @@ -317,7 +317,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR { aCondition.setLength(aCondition.getLength()-5); - aSql.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); aSql.append(aCondition.makeStringAndClear()); } else @@ -352,13 +352,13 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("DELETE FROM "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE FROM ")); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning // first the keys diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index e0a46338c..757e44a8d 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -362,7 +362,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - static const ::rtl::OUString sAll = ::rtl::OUString::createFromAscii("%"); + static const ::rtl::OUString sAll(RTL_CONSTASCII_USTRINGPARAM("%")); Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter ); Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW ); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 2faec3b55..685ca7a57 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -219,7 +219,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, } ::rtl::OUStringBuffer OKeySet::createKeyFilter() { - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); const ::rtl::OUString aQuote = getIdentifierQuoteString(); ::rtl::OUStringBuffer aFilter; static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); @@ -268,7 +268,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O const Sequence< ::rtl::OUString> aSeq = xSelectTables->getElementNames(); if ( aSeq.getLength() > 1 ) // special handling for join { - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -396,22 +396,22 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("DELETE FROM "); + ::rtl::OUStringBuffer aSql(RTL_CONSTASCII_USTRINGPARAM("DELETE FROM ")); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set const ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); - static ::rtl::OUString aOr = ::rtl::OUString::createFromAscii(" OR "); - static ::rtl::OUString aEqual = ::rtl::OUString::createFromAscii(" = ?"); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); + static ::rtl::OUString aOr(RTL_CONSTASCII_USTRINGPARAM(" OR ")); + static ::rtl::OUString aEqual(RTL_CONSTASCII_USTRINGPARAM(" = ?")); // use keys and indexes for excat postioning // first the keys Reference<XNameAccess> xKeyColumns = getKeyColumns(); - ::rtl::OUStringBuffer aCondition = ::rtl::OUString::createFromAscii("( "); + ::rtl::OUStringBuffer aCondition = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("( ")); SelectColumnsMetaData::const_iterator aIter = (*m_pKeyColumnNames).begin(); SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); @@ -484,13 +484,13 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("UPDATE "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE ")); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" SET ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET "))); // list all cloumns that should be set - static ::rtl::OUString aPara = ::rtl::OUString::createFromAscii(" = ?,"); + static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM(" = ?,")); ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -566,7 +566,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if(sKeyCondition.getLength() || sIndexCondition.getLength()) { - aSql.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); if(sKeyCondition.getLength() && sIndexCondition.getLength()) { aSql.append(sKeyCondition.makeStringAndClear()); @@ -659,12 +659,12 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::insertRow" ); - ::rtl::OUStringBuffer aSql(::rtl::OUString::createFromAscii("INSERT INTO ")); + ::rtl::OUStringBuffer aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" ( ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( "))); // set values and column names ::rtl::OUStringBuffer aValues(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( "))); static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); @@ -799,10 +799,10 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString if(sMaxStmt.getLength()) { - sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1,::rtl::OUString::createFromAscii(" ")); - ::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT "); + sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + ::rtl::OUString sStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); sStmt += sMaxStmt; - sStmt += ::rtl::OUString::createFromAscii("FROM "); + sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FROM ")); ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); sStmt += ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); @@ -945,13 +945,13 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("DELETE FROM "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE FROM ")); aSql.append(m_aComposedTableName); - aSql.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning Reference<XNameAccess> xKeyColumns = getKeyColumns(); @@ -980,10 +980,10 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) { OSL_ENSURE(0,"can a primary key be null"); - aSql.append(::rtl::OUString::createFromAscii(" IS NULL")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"))); } else - aSql.append(::rtl::OUString::createFromAscii(" = ?")); + aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ?"))); aSql.append(aAnd); } else @@ -996,10 +996,10 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit { sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) - sIndexCondition.append(::rtl::OUString::createFromAscii(" IS NULL")); + sIndexCondition.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"))); else { - sIndexCondition.append(::rtl::OUString::createFromAscii(" = ?")); + sIndexCondition.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ?"))); aIndexColumnPositions.push_back(aIter->second.nPosition); } sIndexCondition.append(aAnd); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 6d5624f5c..3609068d7 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -187,9 +187,9 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); // list all cloumns that should be set - static ::rtl::OUString s_sPara = ::rtl::OUString::createFromAscii(" = ?"); + static ::rtl::OUString s_sPara(RTL_CONSTASCII_USTRINGPARAM(" = ?")); ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -277,7 +277,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -663,7 +663,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); // here we build the condition part for the update statement diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f5fd76d77..8f6dbd2f6 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -486,7 +486,7 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti rtl::OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ORowSet"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dba.ORowSet")); } // ::com::sun::star::XServiceInfo @@ -2228,7 +2228,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw() m_pTables = new OTableContainer(*this,m_aMutex,m_xActiveConnection,bCase,NULL,NULL,NULL,m_nInAppend); xTables = m_pTables; Sequence< ::rtl::OUString> aTableFilter(1); - aTableFilter[0] = ::rtl::OUString::createFromAscii("%"); + aTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); m_pTables->construct(aTableFilter,Sequence< ::rtl::OUString>()); } @@ -2284,7 +2284,7 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu // filter contains paramters (since a keyset may add parameters itself) // 2003-12-12 - #23418# - fs@openoffice.org m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) ); - m_xComposer->setFilter( ::rtl::OUString::createFromAscii( "0 = 1" ) ); + m_xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0 = 1" ) ) ); } m_xComposer->setOrder( m_aOrder ); @@ -2336,7 +2336,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } else { - sCommand = rtl::OUString::createFromAscii("SELECT * FROM "); + sCommand = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); ::rtl::OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable ); @@ -2852,7 +2852,7 @@ void ORowSetClone::release() throw() // XServiceInfo rtl::OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.ORowSetClone"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ORowSetClone")); } sal_Bool ORowSetClone::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index bced7ba11..4f052bdf4 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -99,7 +99,7 @@ void OCallableStatement::release() throw () rtl::OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" ); - return rtl::OUString::createFromAscii("com.sun.star.sdb.OCallableStatement"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OCallableStatement")); } Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index b56bb6acb..73a397eba 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -108,7 +108,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyCont // ::com::sun::star::lang::XServiceInfo rtl::OUString OColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OColumn"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OColumn")); } sal_Bool OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) @@ -218,7 +218,7 @@ OColumns::~OColumns() // XServiceInfo rtl::OUString OColumns::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OColumns"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OColumns")); } sal_Bool OColumns::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 706ecace3..bca1cadfc 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -107,7 +107,7 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx // XServiceInfo rtl::OUString ODataColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.ODataColumn"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ODataColumn")); } Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index a85fb9190..c38443c0a 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -95,7 +95,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor ) // ::com::sun::star::lang::XServiceInfo rtl::OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumnDescriptor"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumnDescriptor")); } Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) @@ -158,7 +158,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumn"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumn")); } ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper() @@ -442,7 +442,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper ) // ::com::sun::star::lang::XServiceInfo rtl::OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumnDescriptorWrapper"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumnDescriptorWrapper")); } Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) @@ -608,7 +608,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper ) rtl::OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString::createFromAscii( "com.sun.star.sdb.OTableColumnWrapper" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumnWrapper" )); } Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index c9cf33e6c..bca0ffa9b 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -133,7 +133,7 @@ void OPreparedStatement::release() throw () // XServiceInfo rtl::OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OPreparedStatement"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OPreparedStatement")); } sal_Bool OPreparedStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index d5e7e6597..0fa808894 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -224,7 +224,7 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru ::rtl::OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.sdb.OQueryDescriptor"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OQueryDescriptor")); } sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 5c00c3a28..9a185bebc 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -133,7 +133,7 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeExceptio // XServiceInfo rtl::OUString OResultColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.sdb.OResultColumn"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OResultColumn")); } Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index dda2ad98d..f495088bd 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -200,7 +200,7 @@ void OResultSet::close(void) throw( SQLException, RuntimeException ) rtl::OUString OResultSet::getImplementationName( ) throw(RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" ); - return rtl::OUString::createFromAscii("com.sun.star.sdb.OResultSet"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OResultSet")); } sal_Bool OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index b8465d636..1b33f28b5 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -464,7 +464,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ) rtl::OUString OStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" ); - return rtl::OUString::createFromAscii("com.sun.star.sdb.OStatement"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OStatement")); } sal_Bool OStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index dc26115c6..4b86763db 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -408,7 +408,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement if(!sComposedName.getLength()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP "); + ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("DROP ")); if ( bIsView ) // here we have a view aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW ")); diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index a1d8c1643..465e451ac 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -206,7 +206,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN if(!sComposedName.getLength()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW "); + ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("DROP VIEW ")); aSql += sComposedName; Reference<XConnection> xCon = m_xConnection; OSL_ENSURE(xCon.is(),"Connection is null!"); |