diff options
Diffstat (limited to 'connectivity')
69 files changed, 413 insertions, 415 deletions
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index fbf4082f37d4..7d19e700dfbf 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -106,7 +106,7 @@ OConnectionWrapper::~OConnectionWrapper() // -------------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.drivers.OConnectionWrapper" ) ); + return ::rtl::OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index d15e69c1bfa0..f102744f10f6 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS { // get the null date Date aDate; - xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString("NullDate")) >>= aDate; return aDate; } catch ( const Exception& ) @@ -459,7 +459,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D { Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW ); Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW ); - OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate ); + OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= aFormatterNullDate ); } catch( const Exception& ) { diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 465702193b66..6b8f9c0e7a93 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -666,55 +666,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue() // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("SELECT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("INSERT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DELETE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("UPDATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("CREATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("READ"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("READ")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("ALTER")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DROP"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DROP")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("'")); return aValueRef; } // ----------------------------------------------------------------------------- @@ -818,13 +818,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA //------------------------------------------------------------------------------ rtl::OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet")); + return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); return aSNS; } //------------------------------------------------------------------ diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e41a1a70b510..309ec2fe58c1 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -996,7 +996,7 @@ Any ORowSetValue::makeAny() const case DataType::VARBINARY: case DataType::LONGVARBINARY: { - ::rtl::OUStringBuffer sVal(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0x"))); + ::rtl::OUStringBuffer sVal(::rtl::OUString("0x")); Sequence<sal_Int8> aSeq(getSequence()); const sal_Int8* pBegin = aSeq.getConstArray(); const sal_Int8* pEnd = pBegin + aSeq.getLength(); diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 68f1e163c7be..91fa458de183 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -35,13 +35,13 @@ namespace connectivity ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); uno::Reference< sdbc::XConnection > xConnection; - xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection); + xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),xConnection); m_xConnection = xConnection; } //------------------------------------------------------------------------------ rtl::OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")); + return ::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException) @@ -68,7 +68,7 @@ namespace connectivity Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ParameterSubstitution")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdb.ParameterSubstitution"); return aSNS; } diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 1f2a30a7b308..0f7830fa2692 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -93,7 +93,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it { ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable ); - collectColumnInformation(xConnection,sComposedName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ,m_pImpl->m_aColumnInfo); + collectColumnInformation(xConnection,sComposedName,::rtl::OUString("*") ,m_pImpl->m_aColumnInfo); aFind = m_pImpl->m_aColumnInfo.find(_rName); } if ( aFind != m_pImpl->m_aColumnInfo.end() ) @@ -180,7 +180,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " )); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD ")); + aSql += ::rtl::OUString(" ADD "); aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); @@ -203,7 +203,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP ")); + aSql += ::rtl::OUString(" DROP "); aSql += ::dbtools::quoteName( aQuote,_sElementName); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 02bad07afca8..210b642faac3 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ Reference< XRow > xRow(xRet,UNO_QUERY); ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo); Sequence< Any > aTypeInfoSettings; - aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")),aTypeInfoSettings); + aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString("TypeInfoSettings"),aTypeInfoSettings); if ( xRow.is() ) { diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 629556137b39..ea28c41c451e 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -136,7 +136,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName else { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE "))); + ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE ")); ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." )); @@ -233,7 +233,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions ); aSql += sIndexName - + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON ")) + + ::rtl::OUString(" ON ") + aComposedName; Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 1d020bf2b16d..1c8b6490ab02 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -257,7 +257,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c // ----------------------------------------------------------------------------- ::rtl::OUString OKeysHelper::getDropForeignKey() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP CONSTRAINT ")); + return ::rtl::OUString(" DROP CONSTRAINT "); } // ------------------------------------------------------------------------- // XDrop diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index f911f3e3e298..8a4baa2fa147 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -40,9 +40,9 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& ::rtl::OUString sUserWorkingFor; Sequence< ::rtl::OUString > sTableTypes(3); // we want all catalogues, all schemas, all tables - sTableTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); - sTableTypes[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... + sTableTypes[0] = ::rtl::OUString("VIEW"); + sTableTypes[1] = ::rtl::OUString("TABLE"); + sTableTypes[2] = ::rtl::OUString("%"); // just to be sure to include anything else .... try { m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes); @@ -58,7 +58,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& static ODatabaseMetaDataResultSet::ORow aRow(8); aRow[5] = new ORowSetValueDecorator(sUserWorkingFor); aRow[6] = ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[7] = new ORowSetValueDecorator(::rtl::OUString("YES")); aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); aRows.push_back(aRow); @@ -74,7 +74,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getDropValue(); aRows.push_back(aRow); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCE"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("REFERENCE")); aRows.push_back(aRow); setRows(aRows); diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7a85113ad5d0..3822b9af2ecd 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -272,7 +272,7 @@ void OTableHelper::refreshColumns() aCatalog, m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")) + ::rtl::OUString("%") ) ); // collect the column names, together with their ordinal position @@ -476,10 +476,10 @@ void OTableHelper::refreshIndexes() ::rtl::OUString OTableHelper::getRenameStart() const { ::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME ")); - if ( m_Type == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")) ) - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" VIEW ")); + if ( m_Type == ::rtl::OUString("VIEW") ) + sSql += ::rtl::OUString(" VIEW "); else - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TABLE ")); + sSql += ::rtl::OUString(" TABLE "); return sSql; } @@ -512,7 +512,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx ::rtl::OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName - + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO ")); + + ::rtl::OUString(" TO "); sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName; diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 103db51025ed..70dd05740d8d 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -142,7 +142,7 @@ namespace dbtools { Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW ); Reference< XPropertySet > xDataSourceSettings( - xDataSource->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings" ) ) ), + xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ), UNO_QUERY_THROW ); _out_setting = xDataSourceSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _asciiName ) ); diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 8139793f9814..d06ca5e4e276 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, try { // determine the datatype of the column - _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"))) >>= nDataType; + _xColumn->getPropertyValue(::rtl::OUString("Type")) >>= nDataType; if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType) - _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scale"))) >>= nScale; + _xColumn->getPropertyValue(::rtl::OUString("Scale")) >>= nScale; } catch (Exception&) { @@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, } return getDefaultNumberFormat(nDataType, nScale, - ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsCurrency")))), + ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString("IsCurrency"))), _xTypes, _rLocale); } @@ -295,8 +295,8 @@ Reference< XConnection > getConnection_allowException( try { xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; - bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPasswordRequired")))); - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User"))) >>= sUser; + bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString("IsPasswordRequired"))); + xProp->getPropertyValue(::rtl::OUString("User")) >>= sUser; } catch(Exception&) { @@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro Reference< XConnection> xReturn; Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY); if (xRowSetProps.is()) - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xReturn; + xRowSetProps->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xReturn; return xReturn; } @@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R // 1. already connected? Reference< XConnection > xExistingConn( - xRowSetProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ) ), + xRowSetProps->getPropertyValue( ::rtl::OUString( "ActiveConnection" ) ), UNO_QUERY ); if ( xExistingConn.is() @@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R { if ( _bSetAsActiveConnection ) { - xRowSetProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( xExistingConn ) ); + xRowSetProps->setPropertyValue( ::rtl::OUString( "ActiveConnection" ), makeAny( xExistingConn ) ); // no auto disposer needed, since we did not create the connection } @@ -395,9 +395,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" )); ::rtl::OUString sDataSourceName; - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName; + xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; ::rtl::OUString sURL; - xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sURL; + xRowSetProps->getPropertyValue(::rtl::OUString("URL")) >>= sURL; Reference< XConnection > xPureConnection; if (!sDataSourceName.isEmpty()) @@ -429,9 +429,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R if (!sUser.isEmpty()) { // use user and pwd together with the url Sequence< PropertyValue> aInfo(2); - aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); + aInfo.getArray()[0].Name = ::rtl::OUString("user"); aInfo.getArray()[0].Value <<= sUser; - aInfo.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")); + aInfo.getArray()[1].Name = ::rtl::OUString("password"); aInfo.getArray()[1].Value <<= sPwd; xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo ); } @@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R } else xRowSetProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), + ::rtl::OUString( "ActiveConnection" ), makeAny( xConnection.getTyped() ) ); } @@ -672,14 +672,14 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect if ( xComposerFac.is() ) { - Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.SingleSelectQueryComposer"))),UNO_QUERY); + Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY); if ( xComposer.is() ) { xComposer->setQuery( sStatementToExecute ); // Now set the filter to a dummy restriction which will result in an empty // result set. - xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0=1" )) ); + xComposer->setFilter( ::rtl::OUString( "0=1" ) ); sStatementToExecute = xComposer->getQuery( ); } } @@ -703,7 +703,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect { if ( xStatementProps.is() ) xStatementProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxRows" ) ), + ::rtl::OUString( "MaxRows" ), makeAny( sal_Int32( 0 ) ) ); } @@ -1235,19 +1235,19 @@ catch(const Exception&) //------------------------------------------------------------------------------ sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::INSERT) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::INSERT) != 0)); } //------------------------------------------------------------------------------ sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::UPDATE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::UPDATE) != 0)); } //------------------------------------------------------------------------------ sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::DELETE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::DELETE) != 0)); } // ----------------------------------------------------------------------------- Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) @@ -1284,19 +1284,19 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_False; - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )) ) >>= nCommandType ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )) ) >>= sCommand ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" )) ) >>= bEscapeProcessing ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "CommandType" ) ) >>= nCommandType ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sCommand ); + OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing ); StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing ); // append sort - aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) ); + aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Order" ) ) ) ); // append filter sal_Bool bApplyFilter = sal_True; - _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter; + _rxRowSet->getPropertyValue( ::rtl::OUString( "ApplyFilter" ) ) >>= bApplyFilter; if ( bApplyFilter ) - aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) ); + aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Filter" ) ) ) ); aComposer.getQuery(); @@ -1352,8 +1352,8 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( ::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) { - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCatalogInSelect" ) ), sal_True ); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseSchemaInSelect" ) ), sal_True ); + sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseCatalogInSelect" ), sal_True ); + sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseSchemaInSelect" ), sal_True ); return impl_doComposeTableName( _rxConnection->getMetaData(), diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index db7b02bc8c26..a348e8743c66 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -160,14 +160,14 @@ namespace dbtools ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); if ( !aDefault.isEmpty() ) { - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT "))); + aSql.append(::rtl::OUString(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); } // if ( aDefault.getLength() ) if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS) - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"))); + aSql.append(::rtl::OUString(" NOT NULL")); if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty()) { @@ -184,7 +184,7 @@ namespace dbtools ::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) { - ::rtl::OUStringBuffer aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE TABLE "))); + ::rtl::OUStringBuffer aSql(::rtl::OUString("CREATE TABLE ")); ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData(); @@ -199,7 +199,7 @@ namespace dbtools ::dbtools::throwFunctionSequenceException(_xConnection); aSql.append(sComposedName); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aSql.append(::rtl::OUString(" (")); // columns Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); @@ -226,7 +226,7 @@ namespace ::rtl::OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))); + static const ::rtl::OUString sComma(::rtl::OUString(",")); const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" )); @@ -280,7 +280,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY "))); + aSql.append(::rtl::OUString(" PRIMARY KEY ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::UNIQUE) @@ -290,7 +290,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE "))); + aSql.append(::rtl::OUString(" UNIQUE ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::FOREIGN) @@ -302,7 +302,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY "))); + aSql.append(::rtl::OUString(" FOREIGN KEY ")); ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); ::dbtools::qualifiedNameComponents(xMetaData, sRefTable, @@ -321,16 +321,16 @@ namespace switch(nDeleteRule) { case KeyRule::CASCADE: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "))); + aSql.append(::rtl::OUString(" ON DELETE CASCADE ")); break; case KeyRule::RESTRICT: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "))); + aSql.append(::rtl::OUString(" ON DELETE RESTRICT ")); break; case KeyRule::SET_NULL: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "))); + aSql.append(::rtl::OUString(" ON DELETE SET NULL ")); break; case KeyRule::SET_DEFAULT: - aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "))); + aSql.append(::rtl::OUString(" ON DELETE SET DEFAULT ")); break; default: ; @@ -531,7 +531,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) { - xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); + xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) xProp = new connectivity::sdbcx::OColumn(_rName, ::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), @@ -563,7 +563,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection, if ( xDataSourceProperties.is() ) { Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ), + xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), UNO_QUERY_THROW ); OSL_VERIFY( xSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue ); @@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl:: return false; const Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ), + xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), UNO_QUERY_THROW ); @@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const : if ( xProp.is() ) { Sequence< PropertyValue > aInfo; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Info"))) >>= aInfo; + xProp->getPropertyValue(::rtl::OUString("Info")) >>= aInfo; const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty)); @@ -746,7 +746,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, // Some drivers put a table privilege as soon as any column has the privilege, // some drivers only if all columns have the privilege. // To unifiy the situation, collect column privileges here, too. - Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString("%")); Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY); if ( xColumnCurrentRow.is() ) { @@ -819,14 +819,14 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection, const ::rtl::OUString& _rName, ColumnInformationMap& _rInfo) { - static ::rtl::OUString STR_WHERE = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")); + static ::rtl::OUString STR_WHERE = ::rtl::OUString(" WHERE "); - ::rtl::OUString sSelect = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); + ::rtl::OUString sSelect = ::rtl::OUString("SELECT "); sSelect += _rName; - sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")); + sSelect += ::rtl::OUString(" FROM "); sSelect += _sComposedName; sSelect += STR_WHERE; - sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0 = 1")); + sSelect += ::rtl::OUString("0 = 1"); try { @@ -930,7 +930,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc throw SQLException( sMessage, NULL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22018" ) ), + ::rtl::OUString( "22018" ), 22018, Any() ); @@ -956,7 +956,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& throw SQLException( sMessage, NULL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22001" ) ), + ::rtl::OUString( "22001" ), 22001, Any() ); @@ -1007,10 +1007,10 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& } } else - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory")); + return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); } else - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory")); + return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); return ::rtl::OUString(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index d897c9e5ff8c..f80e7ac1907c 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -130,7 +130,7 @@ namespace dbtools _rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY ); // determine the field type, and whether it's a numeric field - OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= _rData.m_nFieldType ); + OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= _rData.m_nFieldType ); switch ( _rData.m_nFieldType ) { @@ -157,7 +157,7 @@ namespace dbtools // get the format key of our bound field Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW ); bool bHaveFieldFormat = false; - const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormatKey" ) ) ); + const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( "FormatKey" ) ); if ( xPSI->hasPropertyByName( sFormatKeyProperty ) ) { bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey ); @@ -173,7 +173,7 @@ namespace dbtools // some more formatter settings _rData.m_nKeyType = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey ); Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW ); - OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ) >>= _rData.m_aNullDate ); + OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= _rData.m_aNullDate ); // remember the formatter _rData.m_xFormatter = i_rNumberFormatter; diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index bd3c5f2c6c07..46be1486fc2d 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -228,14 +228,14 @@ namespace dbtools // format is: // <detail_column> = :<new_param_name> sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink ); - sFilter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " = :" )); + sFilter += ::rtl::OUString( " = :" ); // generate a parameter name which is not already used - _rNewParamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "link_from_" ) ); + _rNewParamName = ::rtl::OUString( "link_from_" ); _rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters ); while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() ) { - _rNewParamName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" ) ); + _rNewParamName += ::rtl::OUString( "_" ); } return sFilter += _rNewParamName; diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index bf65717dc997..414abf20eb19 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -149,7 +149,7 @@ namespace param sal_Int32 nProperties( aProperties.getLength() ); aProperties.realloc( nProperties + 1 ); aProperties[ nProperties ] = Property( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ), + ::rtl::OUString( "Value" ), PROPERTY_ID_VALUE, ::cppu::UnoType< Any >::get(), PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID @@ -186,11 +186,11 @@ namespace param { // TODO : aParamType & nScale can be obtained within the constructor .... sal_Int32 nParamType = DataType::VARCHAR; - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= nParamType ); + OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nParamType ); sal_Int32 nScale = 0; - if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) ) - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) >>= nScale ); + if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( "Scale" ) ) ) + OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= nScale ); if ( m_xValueDestination.is() ) { diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 8b6220ba6107..43ac90c181e4 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -141,7 +141,7 @@ namespace dbtools if ( !pReturn ) { // is it a text field ? sal_Int32 nType = DataType::OTHER; - _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) >>= nType; + _rxField->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nType; if ( ( DataType::CHAR == nType ) || ( DataType::VARCHAR == nType ) @@ -200,17 +200,17 @@ namespace dbtools try { Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() ); - if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) ) + if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString( "FormatKey" ) ) ) { sal_Int32 nFormatKey = 0; - _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) >>= nFormatKey; + _rxField->getPropertyValue( ::rtl::OUString( "FormatKey" ) ) >>= nFormatKey; if ( nFormatKey && m_xFormatter.is() ) { Locale aFormatLocale; ::comphelper::getNumberFormatProperty( m_xFormatter, nFormatKey, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Locale" ) ) + ::rtl::OUString( "Locale" ) ) >>= aFormatLocale; // valid locale @@ -347,8 +347,8 @@ namespace dbtools { // first try the international version ::rtl::OUString sSql; - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * ")); - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE ")); + sSql += ::rtl::OUString("SELECT * "); + sSql += ::rtl::OUString(" FROM x WHERE "); sSql += sField; sSql += _rPredicateValue; ::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) ); diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 085f6e161d68..f0bf69a5bb63 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -127,7 +127,7 @@ namespace dbtools if ( _rData.sCommand.isEmpty() ) break; - sStatement = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) ); + sStatement = ::rtl::OUString( "SELECT * FROM " ); ::rtl::OUString sCatalog, sSchema, sTable; qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation ); @@ -149,12 +149,12 @@ namespace dbtools // a native query ? sal_Bool bQueryEscapeProcessing = sal_False; - xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" ) ) ) >>= bQueryEscapeProcessing; + xQuery->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing; if ( !bQueryEscapeProcessing ) break; // the command used by the query - xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Command" ) ) ) >>= sStatement; + xQuery->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sStatement; if ( sStatement.isEmpty() ) break; @@ -162,7 +162,7 @@ namespace dbtools Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); ::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer; xComposer.set( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), + xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); @@ -170,7 +170,7 @@ namespace dbtools xComposer->setElementaryQuery( sStatement ); // the sort order - const ::rtl::OUString sPropOrder( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) ) ); + const ::rtl::OUString sPropOrder( ::rtl::OUString( "Order" ) ); if ( ::comphelper::hasProperty( sPropOrder, xQuery ) ) { ::rtl::OUString sOrder; @@ -189,7 +189,7 @@ namespace dbtools if ( bApplyFilter ) { ::rtl::OUString sFilter; - OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Filter" ) ) ) >>= sFilter ); + OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( "Filter" ) ) >>= sFilter ); xComposer->setFilter( sFilter ); } @@ -207,7 +207,7 @@ namespace dbtools { // create an composer Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); - Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), + Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); xComposer->setElementaryQuery( sStatement ); diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index ab50f2f5b3b9..7dcd8cffff43 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r break; case PROPERTY_ID_ISAUTOINCREMENT: - OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Autoincrement" )), getBOOL( rValue ) ); + OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString( "Autoincrement" ), getBOOL( rValue ) ); break; case PROPERTY_ID_IM001: @@ -218,7 +218,7 @@ void OAdoColumn::fillPropertyValues() OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), ::o3tl::compose1( - ::std::bind2nd(aCase, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VarBinary"))), + ::std::bind2nd(aCase, ::rtl::OUString("VarBinary")), ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), ::o3tl::select2nd<OTypeInfoMap::value_type>()) @@ -252,11 +252,11 @@ void OAdoColumn::fillPropertyValues() if ( aProps.IsValid() ) { - m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")) ); + m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString("Autoincrement") ); - m_Description = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")) ); + m_Description = OTools::getValue( aProps, ::rtl::OUString("Description") ); - m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")) ); + m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString("Default") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 2fd7b21b6937..5b918cdfef68 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -110,7 +110,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc sal_Bool bAutoIncrement = sal_False; pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; if ( bAutoIncrement ) - OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")), bAutoIncrement ); + OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString("Autoincrement"), bAutoIncrement ); if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary aColumn.put_Type(aFind->first); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 9ffc553f3182..775f0a2aa175 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -138,8 +138,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True); - OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:Engine Type")))); + OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); + OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString("Jet OLEDB:Engine Type"))); if(!aVar.isNull() && !aVar.isEmpty()) m_nEngineType = aVar; } @@ -208,7 +208,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True); + OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); WpADOCommand aCommand; aCommand.Create(); aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index 634660f40558..df38f9e2cfb8 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLExc // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size"))); + return getInt32Property(::rtl::OUString("Maximum Row Size")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) @@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Active Sessions"))); + return getInt32Property(::rtl::OUString("Active Sessions")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in Table"))); + return getInt32Property(::rtl::OUString("Max Columns in Table")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) @@ -269,7 +269,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Tables in SELECT"))); + return getInt32Property(::rtl::OUString("Maximum Tables in SELECT")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( @@ -362,7 +362,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); aRows.push_back(aRow); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue(); @@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size Includes BLOB"))); + return getBoolProperty(::rtl::OUString("Maximum Row Size Includes BLOB")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) @@ -449,17 +449,17 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Index Size"))); + return getInt32Property(::rtl::OUString("Maximum Index Size")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NON_NULL; + return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Term"))); + return getStringProperty(::rtl::OUString("Catalog Term")); } // ------------------------------------------------------------------------- ::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) @@ -480,27 +480,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Location"))) == DBPROPVAL_CL_START; + return getInt32Property(::rtl::OUString("Catalog Location")) == DBPROPVAL_CL_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_IGNORE; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_COMMIT; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DML; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DML; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_ALL; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) @@ -515,29 +515,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Abort Behavior"))) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(::rtl::OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Commit Behavior"))) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(::rtl::OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; + return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; + return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) { sal_Bool bValue(sal_False); - sal_Int32 nTxn = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Levels"))); + sal_Int32 nTxn = getInt32Property(::rtl::OUString("Isolation Levels")); if(level == TransactionIsolation::NONE) bValue = sal_True; else if(level == TransactionIsolation::READ_UNCOMMITTED) @@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) @@ -604,7 +604,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))); + return getBoolProperty(::rtl::OUString("Outer Join Capabilities")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) @@ -629,7 +629,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_NONE; + return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) @@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Read-Only Data Source"))); + return getBoolProperty(::rtl::OUString("Read-Only Data Source")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) @@ -674,7 +674,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NULL; + return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) @@ -689,27 +689,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rowset Conversions on Command"))); + return getBoolProperty(::rtl::OUString("Rowset Conversions on Command")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List"))); + return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_NOT_SUPPORTED; + return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_CONTAINS_SELECT; + return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) == DBPROPVAL_GB_NO_RELATION; + return getInt32Property(::rtl::OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) @@ -729,7 +729,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List"))); + return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) @@ -744,32 +744,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, Ru // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; + return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -779,7 +779,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(S // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; + return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -794,73 +794,73 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; + return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:"))+ m_pADOConnection->GetConnectionString(); + return ::rtl::OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString(); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User Name"))); + return getStringProperty(::rtl::OUString("User Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Friendly Name"))); + return getStringProperty(::rtl::OUString("Provider Friendly Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Version"))); + return getStringProperty(::rtl::OUString("Provider Version")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Version"))); + return getStringProperty(::rtl::OUString("DBMS Version")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Name"))); + return getStringProperty(::rtl::OUString("DBMS Name")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Procedure Term"))); + return getStringProperty(::rtl::OUString("Procedure Term")); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Term"))); + return getStringProperty(::rtl::OUString("Schema Term")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -957,19 +957,19 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support"))); + sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } // ------------------------------------------------------------------------- @@ -977,7 +977,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLExcepti { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))) & 0x00000004L) == 0x00000004L; + return (getInt32Property(::rtl::OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) @@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLExce // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in GROUP BY"))); + return getInt32Property(::rtl::OUString("Max Columns in GROUP BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in ORDER BY"))); + return getInt32Property(::rtl::OUString("Max Columns in ORDER BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 3c9ab91ddb7d..e2ca3ef77a4e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -117,7 +117,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")), + m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 3,3,0, DataType::VARCHAR); @@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("TYPE_NAME"), ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); - m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_DEF")), + m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString("COLUMN_DEF"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")), + m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")), + m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR_OCTET_LENGTH")), + m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("CHAR_OCTET_LENGTH"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PK_NAME"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_UNIQUE")), + m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString("NON_UNIQUE"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_QUALIFIER")), + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("INDEX_QUALIFIER"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASC_OR_DESC")), + m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString("ASC_OR_DESC"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")), + m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PRIVILEGE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { - m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")), + m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")), + m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString("PRECISION"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTO_INCREMENT")), + m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("AUTO_INCREMENT"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")), + m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")), + m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")), + m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString("NUM_PREC_RADIX"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")), + m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues() { WpADOProperties aProps = m_aTable.get_Properties(); if(aProps.IsValid()) - m_Description = OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description"))); + m_Description = OTools::getValue(aProps,::rtl::OUString("Description")); } } } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index ed48af3963c2..ce04f82e5128 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -902,8 +902,8 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aValueRange[12] = aMap; ::std::map< sal_Int32,::rtl::OUString> aMap2; - aMap2[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")); - aMap2[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")); + aMap2[0] = ::rtl::OUString("YES"); + aMap2[1] = ::rtl::OUString("NO"); m_aIntValueRange[18] = aMap2; ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); @@ -1036,8 +1036,8 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() ::std::map< sal_Int32,::rtl::OUString> aMap3; aMap3[0] = ::rtl::OUString(); - aMap3[DB_COLLATION_ASC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A")); - aMap3[DB_COLLATION_DESC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D")); + aMap3[DB_COLLATION_ASC] = ::rtl::OUString("A"); + aMap3[DB_COLLATION_DESC] = ::rtl::OUString("D"); m_aIntValueRange[21] = aMap3; @@ -1058,8 +1058,8 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap() m_aColMapping.push_back(7); ::std::map< sal_Int32,::rtl::OUString> aMap; - aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")); - aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")); + aMap[0] = ::rtl::OUString("YES"); + aMap[1] = ::rtl::OUString("NO"); m_aIntValueRange[7] = aMap; @@ -1085,11 +1085,11 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() m_aColMapping.push_back(18); ::std::map< ::rtl::OUString,sal_Int32> aMap; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CASCADE"))] = KeyRule::CASCADE; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTRICT"))] = KeyRule::RESTRICT; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET NULL"))] = KeyRule::SET_NULL; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET DEFAULT"))] = KeyRule::SET_DEFAULT; - aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO ACTION"))] = KeyRule::NO_ACTION; + aMap[ ::rtl::OUString("CASCADE")] = KeyRule::CASCADE; + aMap[ ::rtl::OUString("RESTRICT")] = KeyRule::RESTRICT; + aMap[ ::rtl::OUString("SET NULL")] = KeyRule::SET_NULL; + aMap[ ::rtl::OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT; + aMap[ ::rtl::OUString("NO ACTION")] = KeyRule::NO_ACTION; m_aStrValueRange[14] = aMap; m_aStrValueRange[15] = aMap; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index cbcc5561eb35..74717ba9a0a0 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -84,14 +84,14 @@ void ODriver::disposing() //------------------------------------------------------------------------------ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ado.ODriver")); + return rtl::OUString("com.sun.star.comp.sdbc.ado.ODriver"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); - aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ @@ -162,26 +162,26 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O ::std::vector< DriverPropertyInfo > aDriverInfo; Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ); - aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); + aBooleanValues[0] = ::rtl::OUString( "false" ); + aBooleanValues[1] = ::rtl::OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver.")) + ::rtl::OUString("IgnoreDriverPrivileges") + ,::rtl::OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,::rtl::OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format.")) + ::rtl::OUString("EscapeDateTime") + ,::rtl::OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) + ,::rtl::OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated.")) + ::rtl::OUString("TypeInfoSettings") + ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.") ,sal_False ,::rtl::OUString( ) ,Sequence< ::rtl::OUString > ()) diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index ee19aec81448..18da7981c1b0 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -81,7 +81,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< WpADOKey aKey = pKey->getImpl(); ::rtl::OUString sName = aKey.get_Name(); if(!sName.getLength()) - aKey.put_Name(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")) ); + aKey.put_Name(::rtl::OUString("PrimaryKey") ); ADOKeys* pKeys = m_aCollection; if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey), diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index ed2373a4af80..de0ba5f7e5cf 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -538,7 +538,7 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(":") ,SQL_NODE_PUNCTUATION,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); ::rtl::OUString sParameterName = _sDefaultName; sParameterName += ::rtl::OUString::valueOf(++_rParameterCount); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 2e10ea9e6f96..804105772a16 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -54,14 +54,14 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ado.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.ado.ResultSet"); } // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); - aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- @@ -901,7 +901,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); - WpADOProperty aProp(aProps.GetItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks Ordered")))); + WpADOProperty aProp(aProps.GetItem(::rtl::OUString("Bookmarks Ordered"))); OLEVariant aVar; if(aProp.IsValid()) aVar = aProp.GetValue(); diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index a2bdef9699f1..31e5938e866e 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -84,7 +84,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISCASESENSITIVE")) ); + bRet = OTools::getValue( aProps, ::rtl::OUString("ISCASESENSITIVE") ); } return bRet; } @@ -114,7 +114,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - sTableName = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BASETABLENAME")) ); + sTableName = OTools::getValue( aProps, ::rtl::OUString("BASETABLENAME") ); } return sTableName; } @@ -160,7 +160,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) { - bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISAUTOINCREMENT")) ); + bRet = OTools::getValue( aProps, ::rtl::OUString("ISAUTOINCREMENT") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); for (sal_Int32 i = 0; i<nCount; ++i) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 0d042d84f2e7..35664bdbbcb6 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -354,7 +354,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, ::rtl::OUString aBatchSql; sal_Int32 nLen = 0; for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) - aBatchSql = aBatchSql + *i + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + aBatchSql = aBatchSql + *i + ::rtl::OUString(";"); if ( m_RecordSet.IsValid() ) diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index fe4a337b6874..e0c51af338b2 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -215,7 +215,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV case PROPERTY_ID_DESCRIPTION: OTools::putValue( m_aTable.get_Properties(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), + ::rtl::OUString("Description"), getString(rValue)); break; diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index cbdde99e7be5..1a24260b7f7e 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -436,7 +436,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) throw ::com::sun::star::sdbc::SQLException( sError, NULL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "S1000" )), + ::rtl::OUString( "S1000" ), 1000, ::com::sun::star::uno::Any() ); diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 75655025e37d..37b6636df462 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -69,7 +69,7 @@ const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613); OLEString& ADOS::GetKeyStr() { - static OLEString sKeyStr(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz"))); + static OLEString sKeyStr(::rtl::OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz")); return sKeyStr; } diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 4e84462da2af..2d7481413ed8 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index b9a20b1fd00d..925cd763c47c 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -104,25 +104,25 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const switch(eDayOfWeek) { case MONDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Monday")); + sRet = ::rtl::OUString("Monday"); break; case TUESDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tuesday")); + sRet = ::rtl::OUString("Tuesday"); break; case WEDNESDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wednesday")); + sRet = ::rtl::OUString("Wednesday"); break; case THURSDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thursday")); + sRet = ::rtl::OUString("Thursday"); break; case FRIDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Friday")); + sRet = ::rtl::OUString("Friday"); break; case SATURDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Saturday")); + sRet = ::rtl::OUString("Saturday"); break; case SUNDAY: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sunday")); + sRet = ::rtl::OUString("Sunday"); break; default: OSL_FAIL("Error in enum values for date"); @@ -140,40 +140,40 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const switch(aD.Month) { case 1: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("January")); + sRet = ::rtl::OUString("January"); break; case 2: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("February")); + sRet = ::rtl::OUString("February"); break; case 3: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("March")); + sRet = ::rtl::OUString("March"); break; case 4: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("April")); + sRet = ::rtl::OUString("April"); break; case 5: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("May")); + sRet = ::rtl::OUString("May"); break; case 6: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("June")); + sRet = ::rtl::OUString("June"); break; case 7: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("July")); + sRet = ::rtl::OUString("July"); break; case 8: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("August")); + sRet = ::rtl::OUString("August"); break; case 9: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("September")); + sRet = ::rtl::OUString("September"); break; case 10: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("October")); + sRet = ::rtl::OUString("October"); break; case 11: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("November")); + sRet = ::rtl::OUString("November"); break; case 12: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("December")); + sRet = ::rtl::OUString("December"); break; } return sRet; diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 2c3c380ba691..ea447b75fc02 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -44,8 +44,8 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -71,7 +71,7 @@ void OHCatalog::refreshTables() void OHCatalog::refreshViews() { Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); + aTypes[0] = ::rtl::OUString("VIEW"); sal_Bool bSupportsViews = sal_False; try @@ -108,7 +108,7 @@ void OHCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from hsqldb.user group by User"))); + Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from hsqldb.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 2b1f9c0464a0..62e71bb6ce6a 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -181,7 +181,7 @@ namespace connectivity { namespace hsqldb if ( !m_bReadOnly ) { Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW ); - xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CHECKPOINT DEFRAG" ) ) ); + xStmt->execute( ::rtl::OUString( "CHECKPOINT DEFRAG" ) ); } } @@ -359,7 +359,7 @@ namespace connectivity { namespace hsqldb // ask the provider to obtain a graphic Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMediaProperties[0].Name = ::rtl::OUString( "URL" ); aMediaProperties[0].Value <<= sImageURL; xGraphic = xProvider->queryGraphic( aMediaProperties ); OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" ); diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index 251f5452cc34..bb0a279743cf 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.cxx @@ -37,7 +37,7 @@ namespace connectivity { namespace hsqldb LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix ) { m_sFileName = StorageContainer::jstring2ustring(env,streamName); - m_sFileName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); + m_sFileName += ::rtl::OUString("."); m_sFileName += ::rtl::OUString::createFromAscii( _pAsciiSuffix ); } diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 0fe5563271bb..61722dd1df4d 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -437,13 +437,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( // here we know that the count of column doesn't match ::std::map<sal_Int32,sal_Int32> aColumnMatching; static const ::rtl::OUString sPrivs[] = { - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_CAT")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_SCHEM")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_NAME")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTOR")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTEE")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")) + ::rtl::OUString("TABLE_CAT"), + ::rtl::OUString("TABLE_SCHEM"), + ::rtl::OUString("TABLE_NAME"), + ::rtl::OUString("GRANTOR"), + ::rtl::OUString("GRANTEE"), + ::rtl::OUString("PRIVILEGE"), + ::rtl::OUString("IS_GRANTABLE") }; ::rtl::OUString sColumnName; @@ -560,7 +560,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod { ::rtl::OUString sLoggedResult( sReturn ); if ( sLoggedResult.isEmpty() ) - sLoggedResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<empty string>" ) ); + sLoggedResult = ::rtl::OUString( "<empty string>" ); m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } @@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS // log the call if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) ); - ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) ); + ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" ); + ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" ); if ( _pOptionalAdditionalString ) m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString ); else diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 7c5ec0dfa47b..de5be71cdc23 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -43,11 +43,11 @@ void KabCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), aTypes); if (xResult.is()) diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index 89c04ec51262..0014e7961acd 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.cxx @@ -62,7 +62,7 @@ void KabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 5d1663323591..52ed23db9ab3 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang; sdbcx::ObjectType KabTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 18855adc7a21..9bfe86a46ca0 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -43,11 +43,11 @@ void MacabCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), aTypes); if (xResult.is()) @@ -84,7 +84,7 @@ void MacabCatalog::refreshUsers() // ------------------------------------------------------------------------- const ::rtl::OUString& MacabCatalog::getDot() { - static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")); + static const ::rtl::OUString sDot = ::rtl::OUString("."); return sDot; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index 5bd1690c769c..a5fec27c8550 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -69,7 +69,7 @@ void MacabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); + ::rtl::OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index afc9d38caa03..a9f7d9685f0c 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang; sdbcx::ObjectType MacabTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 87edf95eac10..26ac1f5f3027 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -51,9 +51,9 @@ void OCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes); + ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 2f24c94c7092..a2b6297c5936 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -87,13 +87,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -115,7 +115,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); // Iterate over all tables for(size_t j = 0; j < tables.size(); j++ ) { @@ -848,15 +848,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE // there exists no possibility to get table types so we have to check static ::rtl::OUString sTableTypes[] = { - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW")) + ::rtl::OUString("TABLE"), + ::rtl::OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM")) + // ::rtl::OUString("SYSTEM TABLE"), + // ::rtl::OUString("GLOBAL TEMPORARY"), + // ::rtl::OUString("LOCAL TEMPORARY"), + // ::rtl::OUString("ALIAS"), + // ::rtl::OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -890,7 +890,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")))); + aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); // Iterate over all tables diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 6cca9c218926..ece7f291ded7 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mork.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.mork.ResultSet"); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) @@ -733,11 +733,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + rMatchString = ::rtl::OUString(""); rtl::OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?")); + aParameterName = ::rtl::OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -939,7 +939,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + matchString = ::rtl::OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -992,7 +992,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); op = MQueryOp::RegExp; } @@ -1003,13 +1003,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); } op = MQueryOp::RegExp; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 725f665b153e..62e0ba0adc08 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -47,11 +47,11 @@ using namespace dbtools; sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index c08bae179398..668a41f76993 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -51,9 +51,9 @@ void OCatalog::refreshTables() { TStringVector aVector; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes); + ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index a84afd6e0658..871cbbf22a3a 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -100,7 +100,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su { //............................................................. Reference< XNameAccess > xAliasesNode; - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xAliasesNode; + xDriverNode->getPropertyValue( ::rtl::OUString("ColumnAliases") ) >>= xAliasesNode; OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" ); // this is a set of string nodes diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 8b4ee14ad2a4..ee1e1b3c6761 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -54,14 +54,14 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), + ::rtl::OUString("nodepath"), 0, makeAny( sCompleteNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("depth")), + ::rtl::OUString("depth"), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE @@ -70,7 +70,7 @@ namespace connectivity //========================================================= // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess" )), + ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess" ), aArguments ); OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" ); @@ -125,10 +125,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; if ( xMozPrefsNode.is() ) xMozPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii(sNode) ) >>= sDescription; if (sDescription.getLength() == 0) @@ -157,10 +157,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; } catch( const Exception& ) { @@ -198,7 +198,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { usPabDescription = ::connectivity::mozab::getDescription( "PabDescription" , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Personal Address Book" ))); + ::rtl::OUString("Personal Address Book" )); sPabDescription = ::rtl::OUStringToOString( usPabDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; @@ -218,7 +218,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { usHisDescription = ::connectivity::mozab::getDescription( "HisDescription" , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Collected Addresses" ))); + ::rtl::OUString("Collected Addresses" )); sHisDescription = ::rtl::OUStringToOString( usHisDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index ea4a680f2e34..8492941706ca 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -92,13 +92,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""))); + aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -120,7 +120,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES"))); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); const OColumnAlias& colNames = m_pConnection->getColumnAlias(); @@ -853,15 +853,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE // there exists no possibility to get table types so we have to check static ::rtl::OUString sTableTypes[] = { - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW")) + ::rtl::OUString("TABLE"), + ::rtl::OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")), - // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM")) + // ::rtl::OUString("SYSTEM TABLE"), + // ::rtl::OUString("GLOBAL TEMPORARY"), + // ::rtl::OUString("LOCAL TEMPORARY"), + // ::rtl::OUString("ALIAS"), + // ::rtl::OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -895,7 +895,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")))); + aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO"))); + aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); // Iterate over all tables diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index b0711fccf017..06ae1ca0fe1a 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -63,14 +63,14 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mozab.ResultSet")); + return ::rtl::OUString("com.sun.star.sdbcx.mozab.ResultSet"); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); + aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- @@ -716,11 +716,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + rMatchString = ::rtl::OUString(""); rtl::OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?")); + aParameterName = ::rtl::OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -922,7 +922,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")); + matchString = ::rtl::OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -975,7 +975,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); op = MQueryOp::RegExp; } @@ -986,13 +986,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) ); + matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); } op = MQueryOp::RegExp; @@ -1089,9 +1089,9 @@ void OResultSet::fillRowData() OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement"); ::rtl::OUString aStr; if (xConnection->isLDAP()) - aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail")); + aStr = ::rtl::OUString("PrimaryEmail"); else - aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("card:nsIAbCard")); + aStr = ::rtl::OUString("card:nsIAbCard"); eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) ); queryExpression.setExpressions( eVector ); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 0d11b8d1d46d..dd6f93bfd3a6 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -47,11 +47,11 @@ using namespace dbtools; sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aSchema = ::rtl::OUString("%"); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + aTypes[0] = ::rtl::OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index bb4af33dfc6e..cf9bb13b3dd9 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -62,7 +62,7 @@ nsProfile::nsProfile() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index e841826a6d98..23a721742b63 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0; @@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp // Insert table into map if ( aTableName.isEmpty() ) - aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook")); + aTableName = rtl::OUString("AddressBook"); OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp //map mailing lists as views _rStrings->push_back( aTableName ); // Table name if (!bIsMailList) { - ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE"))); + ::rtl::OUString aTableType(::rtl::OUString("TABLE")); _rTypes->push_back( aTableType ); // Table type } else { - ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW"))); + ::rtl::OUString aTableType(::rtl::OUString("VIEW")); _rTypes->push_back( aTableType ); // Table type } } @@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* Reference<XMozillaBootstrap> xMozillaBootstrap; Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = sal_False; @@ -624,7 +624,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ::std::vector< ::rtl::OUString > tables; ::std::vector< ::rtl::OUString > tabletypes; - ::rtl::OUString matchAny = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); + ::rtl::OUString matchAny = rtl::OUString("%"); if ( !getTableStrings( _pCon, tables,tabletypes ) ) return sal_False; @@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) { if ( aTableName.isEmpty() ) { - aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook")); + aTableName = rtl::OUString("AddressBook"); } OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 4f0dce89b0d8..305b0da6ccf3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo { Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index cfea2d48c3e6..21bed90e07dc 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY); if (_pCon) diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 47094a43adee..a756e2ce01c8 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -45,8 +45,8 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCa void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), + ::rtl::OUString("%"), + ::rtl::OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -74,7 +74,7 @@ void OMySQLCatalog::refreshTables() void OMySQLCatalog::refreshViews() { Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); + aTypes[0] = ::rtl::OUString("VIEW"); // let's simply assume the server is new enough to support views. Current drivers // as of this writing might not return the proper information in getTableTypes, so @@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from mysql.user group by User"))); + Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from mysql.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 5158d9bdc59b..9344bd266fb6 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -78,7 +78,7 @@ namespace pq_sdbc_driver ::rtl::OUString Array::getBaseTypeName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "varchar" ) ); + return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 0401c55f2805..0f9e0aeac4bd 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -124,25 +124,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() // Should really share! // At least use for the handles the #define'd values in .hxx file... Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("IsBookmarkable") ), 4, + OUString("IsBookmarkable"), 4, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 5, + OUString("ResultSetConcurrency"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 6, + OUString("ResultSetType"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable) / sizeof(Property) == BASERESULTSET_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 1c0d52ad887b..7a14c3b20478 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -160,7 +160,7 @@ public: OUString ConnectionGetImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Connection.noext" ) ); + return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void) { @@ -331,8 +331,7 @@ Reference< XPreparedStatement > Connection::prepareCall( const ::rtl::OUString& throw (SQLException, RuntimeException) { throw SQLException( - OUString( - RTL_CONSTASCII_USTRINGPARAM( "pq_driver: Callable statements not supported" ) ), + OUString( "pq_driver: Callable statements not supported" ), Reference< XInterface > (), OUString() , 1, Any() ); } @@ -546,7 +545,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) if( ! tc.is() ) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("pq_driver: Couldn't instantiate converter service" )), + OUString("pq_driver: Couldn't instantiate converter service" ), Reference< XInterface > () ); } if( aArguments.getLength() != 2 ) @@ -594,7 +593,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) free(err); } else - errorMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("#no error message#")); + errorMessage = OUString("#no error message#"); OUStringBuffer buf( 128 ); buf.appendAscii( "Error in database URL '" ); buf.append( url ); @@ -602,7 +601,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) buf.append( errorMessage ); // HY092 is "Invalid attribute/option identifier." // Just the most likely error; the error might be HY024 "Invalid attribute value". - throw SQLException( buf.makeStringAndClear(), *this, OUString(RTL_CONSTASCII_USTRINGPARAM("HY092")), 5, Any() ); + throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() ); } for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != NULL; ++opt) @@ -621,7 +620,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) m_settings.pConnection = PQconnectdbParams( keywords.c_array(), values.c_array(), 0 ); } if( ! m_settings.pConnection ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "pq_driver: out of memory" ) ), + throw RuntimeException( OUString( "pq_driver: out of memory" ), Reference< XInterface > () ); if( PQstatus( m_settings.pConnection ) == CONNECTION_BAD ) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 10bdfe44b8bd..96e719faf5e0 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -134,7 +134,7 @@ Reference< XConnection > Driver::connect( seq[1] <<= info; return Reference< XConnection> ( m_smgr->createInstanceWithArgumentsAndContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection.noext" ) ), + OUString("org.openoffice.comp.connectivity.pq.Connection.noext" ), seq, m_ctx ), UNO_QUERY ); } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index b2aa68313743..a8a4058c94c4 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -129,31 +129,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4, + OUString("MaxFieldSize"), 4, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5, + OUString("MaxRows"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6, + OUString("QueryTimeOut"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7, + OUString("ResultSetConcurrency"), 7, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8, + OUString("ResultSetType"), 8, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == PREPARED_STATEMENT_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 42ded6e07398..49b82ae63282 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -145,31 +145,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0, + OUString("CursorName"), 0, ::getCppuType( (OUString *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1, + OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2, + OUString("FetchDirection"), 2, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3, + OUString("FetchSize"), 3, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4, + OUString("MaxFieldSize"), 4, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5, + OUString("MaxRows"), 5, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6, + OUString("QueryTimeOut"), 6, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7, + OUString("ResultSetConcurrency"), 7, ::getCppuType( (sal_Int32 *)0) , 0 ), Property( - OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8, + OUString("ResultSetType"), 8, ::getCppuType( (sal_Int32 *)0) , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == STATEMENT_SIZE ); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 7e6340f9a711..2cb273678019 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -239,7 +239,7 @@ void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & valu // We have no good XInterface Reference to pass here, so just give NULL throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), NULL, - OUString(RTL_CONSTASCII_USTRINGPARAM("22018")), + OUString("22018"), -1, Any()); } @@ -285,7 +285,7 @@ static inline void ibufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl: // Implementation-defined SQLACCESS error throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), NULL, - OUString(RTL_CONSTASCII_USTRINGPARAM("22018")), + OUString("22018"), -1, Any()); } diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index fdbc11428757..b07315bd7289 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -265,8 +265,7 @@ void ReflectionBase::setName( const ::rtl::OUString& /* aName */ ) throw (::com::sun::star::uno::RuntimeException) { throw RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "pq_sdbc::ReflectionBase::setName not implemented" ) ), + rtl::OUString( "pq_sdbc::ReflectionBase::setName not implemented" ), *this ); //setPropertyValue( getStatics().NAME , makeAny( aName ) ); } |