[Libreoffice-commits] .: 3 commits - connectivity/source xmloff/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 07:43:03 PDT 2012
connectivity/source/cpool/ZPoolCollection.cxx | 26 -
connectivity/source/drivers/calc/CCatalog.cxx | 2
connectivity/source/drivers/calc/CConnection.cxx | 10
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 26 -
connectivity/source/drivers/calc/CDriver.cxx | 4
connectivity/source/drivers/calc/CResultSet.cxx | 6
connectivity/source/drivers/calc/CTable.cxx | 22 -
connectivity/source/drivers/calc/CTables.cxx | 2
connectivity/source/drivers/dbase/DCatalog.cxx | 2
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 52 +-
connectivity/source/drivers/dbase/DDriver.cxx | 24 -
connectivity/source/drivers/dbase/DIndex.cxx | 6
connectivity/source/drivers/dbase/DIndexes.cxx | 2
connectivity/source/drivers/dbase/DResultSet.cxx | 6
connectivity/source/drivers/dbase/DTable.cxx | 46 +-
connectivity/source/drivers/dbase/DTables.cxx | 2
connectivity/source/drivers/evoab2/NCatalog.cxx | 4
connectivity/source/drivers/evoab2/NConnection.cxx | 6
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 22 -
connectivity/source/drivers/evoab2/NDriver.cxx | 4
connectivity/source/drivers/evoab2/NResultSet.cxx | 4
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 4
connectivity/source/drivers/evoab2/NStatement.cxx | 2
connectivity/source/drivers/evoab2/NTables.cxx | 4
connectivity/source/drivers/file/FCatalog.cxx | 2
connectivity/source/drivers/file/FConnection.cxx | 6
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 20
connectivity/source/drivers/file/FDriver.cxx | 44 +-
connectivity/source/drivers/file/FTable.cxx | 2
connectivity/source/drivers/flat/ECatalog.cxx | 2
connectivity/source/drivers/flat/EDatabaseMetaData.cxx | 26 -
connectivity/source/drivers/flat/EDriver.cxx | 36 -
connectivity/source/drivers/flat/EResultSet.cxx | 6
connectivity/source/drivers/flat/ETable.cxx | 20
connectivity/source/drivers/flat/ETables.cxx | 2
connectivity/source/drivers/hsqldb/HColumns.cxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 74 +--
connectivity/source/drivers/hsqldb/HTable.cxx | 30 -
connectivity/source/drivers/hsqldb/HTables.cxx | 14
connectivity/source/drivers/hsqldb/HUser.cxx | 62 +-
connectivity/source/drivers/hsqldb/HUsers.cxx | 10
connectivity/source/drivers/hsqldb/HViews.cxx | 6
connectivity/source/drivers/jdbc/JDriver.cxx | 78 +--
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 22 -
connectivity/source/drivers/kab/KDriver.cxx | 18
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 2
connectivity/source/drivers/macab/MacabAddressBook.cxx | 6
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 32 -
connectivity/source/drivers/macab/MacabRecords.cxx | 14
connectivity/source/drivers/macab/MacabResultSet.cxx | 4
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx | 2
connectivity/source/drivers/mysql/YColumns.cxx | 4
connectivity/source/drivers/mysql/YDriver.cxx | 64 +-
connectivity/source/drivers/mysql/YTable.cxx | 32 -
connectivity/source/drivers/mysql/YTables.cxx | 18
connectivity/source/drivers/mysql/YUser.cxx | 62 +-
connectivity/source/drivers/mysql/YUsers.cxx | 10
connectivity/source/drivers/mysql/YViews.cxx | 6
connectivity/source/drivers/odbc/OFunctions.cxx | 116 ++---
connectivity/source/drivers/odbcbase/OConnection.cxx | 10
connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx | 4
connectivity/source/drivers/odbcbase/ODriver.cxx | 58 +-
connectivity/source/drivers/odbcbase/OResultSet.cxx | 6
connectivity/source/drivers/odbcbase/OStatement.cxx | 2
connectivity/source/manager/mdrivermanager.cxx | 14
connectivity/source/parse/PColumn.cxx | 2
connectivity/source/parse/sqliterator.cxx | 24 -
connectivity/source/parse/sqlnode.cxx | 86 ++--
connectivity/source/sdbcx/VColumn.cxx | 8
connectivity/source/sdbcx/VIndex.cxx | 8
connectivity/source/sdbcx/VIndexColumn.cxx | 8
connectivity/source/sdbcx/VKey.cxx | 8
connectivity/source/sdbcx/VKeyColumn.cxx | 8
connectivity/source/sdbcx/VTable.cxx | 8
xmloff/source/chart/PropertyMaps.cxx | 10
xmloff/source/chart/SchXMLChartContext.cxx | 58 +-
xmloff/source/chart/SchXMLExport.cxx | 215 ++++------
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 94 ++--
xmloff/source/chart/SchXMLSeries2Context.cxx | 85 +--
xmloff/source/chart/SchXMLSeriesHelper.cxx | 8
xmloff/source/chart/SchXMLTools.cxx | 90 ++--
xmloff/source/core/RDFaExportHelper.cxx | 5
xmloff/source/core/unoatrcn.cxx | 6
xmloff/source/core/xmluconv.cxx | 7
xmloff/source/draw/sdxmlimp.cxx | 24 -
xmloff/source/draw/shapeexport.cxx | 80 +--
xmloff/source/draw/shapeexport2.cxx | 185 ++++----
xmloff/source/draw/xexptran.cxx | 48 +-
xmloff/source/draw/ximpshap.cxx | 211 ++++-----
93 files changed, 1261 insertions(+), 1273 deletions(-)
New commits:
commit d6fef33ef731e96ab55979fa6451f1c1d773103d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 09:42:35 2012 -0500
targeted string re-work
Change-Id: Iac38f0f2622b1f7ddcc6f91b022c949e7a733c41
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 65c4977..591b309 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -56,7 +56,7 @@ void OCalcCatalog::refreshTables()
Sequence< ::rtl::OUString > aTypes;
OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
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/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index e7ac50d..6bf3c62 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -122,21 +122,21 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
}
// open read-only as long as updating isn't implemented
Sequence<PropertyValue> aArgs(2);
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+ aArgs[0].Name = ::rtl::OUString("Hidden");
aArgs[0].Value <<= (sal_Bool) sal_True;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ aArgs[1].Name = ::rtl::OUString("ReadOnly");
aArgs[1].Value <<= (sal_Bool) sal_True;
if ( !m_sPassword.isEmpty() )
{
const sal_Int32 nPos = aArgs.getLength();
aArgs.realloc(nPos+1);
- aArgs[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"));
+ aArgs[nPos].Name = ::rtl::OUString("Password");
aArgs[nPos].Value <<= m_sPassword;
}
Reference< XComponentLoader > xDesktop( getDriver()->getFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
+ ::rtl::OUString("com.sun.star.frame.Desktop")), UNO_QUERY );
if (!xDesktop.is())
{
OSL_FAIL("no desktop");
@@ -147,7 +147,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
try
{
xComponent = xDesktop->loadComponentFromURL(
- m_aFileName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, aArgs );
+ m_aFileName, ::rtl::OUString("_blank"), 0, aArgs );
}
catch( const Exception& )
{
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index a8077f7..43c1fc1 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -89,7 +89,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRow.reserve(18);
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)65535));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -111,35 +111,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL"));
aRow[2] = new ORowSetValueDecorator(DataType::BIT);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
aRow[2] = new ORowSetValueDecorator(DataType::DATE);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME"));
aRow[2] = new ORowSetValueDecorator(DataType::TIME);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
@@ -228,10 +228,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
switch(sal_Int32(aRow[11]->getValue()))
{
case ColumnValue::NO_NULLS:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
break;
case ColumnValue::NULLABLE:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
break;
default:
aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
@@ -256,7 +256,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:calc:")) + m_pConnection->getURL();
+ return ::rtl::OUString("sdbc:calc:") + m_pConnection->getURL();
}
// -------------------------------------------------------------------------
@@ -307,7 +307,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r
if (xProp.is())
{
sal_Bool bVisible = sal_Bool();
- Any aVisAny = xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
+ Any aVisAny = xProp->getPropertyValue( ::rtl::OUString("IsVisible") );
if ( aVisAny >>= bVisible )
if (!bVisible)
return sal_True; // hidden
@@ -350,7 +350,7 @@ sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::
{
try
{
- Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUserDefined")) );
+ Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString("IsUserDefined") );
sal_Bool bUserDefined = sal_Bool();
if ( aUserAny >>= bUserDefined )
bUnnamed = !bUserDefined;
@@ -381,7 +381,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
// check if ORowSetValue type is given
// when no types are given then we have to return all tables e.g. TABLE
- ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ ::rtl::OUString aTable("TABLE");
sal_Bool bTableFound = sal_True;
sal_Int32 nLength = types.getLength();
@@ -435,7 +435,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges")) );
+ Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") );
Reference<XDatabaseRanges> xRanges;
if ( aRangesAny >>= xRanges )
{
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index db04060..61d57b5 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang;
rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.calc.ODriver"));
+ return rtl::OUString("com.sun.star.comp.sdbc.calc.ODriver");
}
::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
@@ -87,7 +87,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
throw(SQLException, RuntimeException)
{
- return url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:calc:")),10) == 0;
+ return url.compareTo(::rtl::OUString("sdbc:calc:"),10) == 0;
}
Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index ebce3e7..0a17f8d 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -53,14 +53,14 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.calc.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.calc.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
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;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index c1bfc58..1334046 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -155,7 +155,7 @@ CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
- static const ::rtl::OUString s_sFormulaResultType(RTL_CONSTASCII_USTRINGPARAM("FormulaResultType"));
+ static const ::rtl::OUString s_sFormulaResultType("FormulaResultType");
Reference<XPropertySet> xProp( xCell, UNO_QUERY );
try
{
@@ -274,7 +274,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X
sal_Int16 nNumType = NumberFormat::NUMBER;
try
{
- static ::rtl::OUString s_NumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ static ::rtl::OUString s_NumberFormat("NumberFormat");
sal_Int32 nKey = 0;
if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey )
@@ -486,24 +486,24 @@ void OCalcTable::fillColumns()
{
case DataType::VARCHAR:
{
- static const ::rtl::OUString s_sType(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
+ static const ::rtl::OUString s_sType("VARCHAR");
aTypeName = s_sType;
}
break;
case DataType::DECIMAL:
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
+ aTypeName = ::rtl::OUString("DECIMAL");
break;
case DataType::BIT:
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL"));
+ aTypeName = ::rtl::OUString("BOOL");
break;
case DataType::DATE:
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
+ aTypeName = ::rtl::OUString("DATE");
break;
case DataType::TIME:
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
+ aTypeName = ::rtl::OUString("TIME");
break;
case DataType::TIMESTAMP:
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
+ aTypeName = ::rtl::OUString("TIMESTAMP");
break;
default:
OSL_FAIL("missing type name");
@@ -578,7 +578,7 @@ void OCalcTable::construct()
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges")) ),UNO_QUERY);
+ Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ),UNO_QUERY);
if ( xRanges.is() && xRanges->hasByName( m_Name ) )
{
@@ -592,7 +592,7 @@ void OCalcTable::construct()
sal_Bool bRangeHeader = sal_True;
Reference<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY );
if ( xFiltProp.is() )
- xFiltProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainsHeader"))) >>= bRangeHeader;
+ xFiltProp->getPropertyValue(::rtl::OUString("ContainsHeader")) >>= bRangeHeader;
Reference<XSheetCellRange> xSheetRange( xRefer->getReferredCells(), UNO_QUERY );
Reference<XCellRangeAddressable> xAddr( xSheetRange, UNO_QUERY );
@@ -626,7 +626,7 @@ void OCalcTable::construct()
if (xProp.is())
{
::com::sun::star::util::Date aDateStruct;
- if ( xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate")) ) >>= aDateStruct )
+ if ( xProp->getPropertyValue( ::rtl::OUString("NullDate") ) >>= aDateStruct )
m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year );
}
}
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index d1052f0..833f3a8 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -49,7 +49,7 @@ sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTables::createObject" );
OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
- _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
+ _rName,::rtl::OUString("TABLE"));
sdbcx::ObjectType xRet = pTable;
pTable->construct();
return xRet;
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 8c9bd55..62c4766 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -52,7 +52,7 @@ void ODbaseCatalog::refreshTables()
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes;
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/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index aad436e..2a2b8d8 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -80,19 +80,19 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( )
aRow.reserve(18);
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)254));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("length"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("length")));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE));
aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::FULL));
aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("C"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("C")));
aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
@@ -101,62 +101,62 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR"));
aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
aRow[3] = new ORowSetValueDecorator((sal_Int32)2147483647);
aRow[6] = new ORowSetValueDecorator();
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("M")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("M"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
aRow[2] = new ORowSetValueDecorator(DataType::DATE);
aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("D"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOLEAN")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOLEAN"));
aRow[2] = new ORowSetValueDecorator(DataType::BIT);
aRow[3] = ODatabaseMetaDataResultSet::get1Value();
aRow[4] = ODatabaseMetaDataResultSet::getEmptyValue();
aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
aRow[6] = new ORowSetValueDecorator(::rtl::OUString());
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("L"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE"));
aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("B")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("B"));
aRows.push_back(aRow);
aRow[11] = new ORowSetValueDecorator(sal_True);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Y")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("Y"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
aRow[11] = new ORowSetValueDecorator(sal_False);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("T")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("T"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTEGER")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER"));
aRow[2] = new ORowSetValueDecorator(DataType::INTEGER);
aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("I")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("I"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
- aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("length,scale")));
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("F")));
+ aRow[6] = new ORowSetValueDecorator(::rtl::OUString("length,scale"));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("F"));
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC"));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = new ORowSetValueDecorator((sal_Int32)16);
- aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("N")));
+ aRow[13] = new ORowSetValueDecorator(::rtl::OUString("N"));
aRow[15] = new ORowSetValueDecorator((sal_Int32)16);
aRows.push_back(aRow);
}
@@ -236,10 +236,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
switch(sal_Int32(aRow[11]->getValue()))
{
case ColumnValue::NO_NULLS:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
break;
case ColumnValue::NULLABLE:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
break;
default:
aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
@@ -275,7 +275,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
ODatabaseMetaDataResultSet::ORow aRow(14);
aRow[5] = new ORowSetValueDecorator(::rtl::OUString());
- aRow[10] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A")));
+ aRow[10] = new ORowSetValueDecorator(::rtl::OUString("A"));
Reference< XIndexesSupplier> xTable;
::cppu::extractInterface(xTable,xNames->getByName(table));
@@ -337,7 +337,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) + m_pConnection->getURL();
+ return ::rtl::OUString("sdbc:dbase:") + m_pConnection->getURL();
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
@@ -388,7 +388,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run
::osl::MutexGuard aGuard( m_aMutex );
sal_Bool bReadOnly = sal_False;
- static ::rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ));
+ static ::rtl::OUString sReadOnly( "IsReadOnly" );
::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >());
aFile.getPropertyValue(sReadOnly) >>= bReadOnly;
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 1c49ef0..86d622a 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::lang;
//------------------------------------------------------------------------------
rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.dbase.ODriver"));
+ return rtl::OUString("com.sun.star.comp.sdbc.dbase.ODriver");
}
//------------------------------------------------------------------
@@ -79,7 +79,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
// --------------------------------------------------------------------------------
sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException)
{
- return !url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")),11);
+ return !url.compareTo(::rtl::OUString("sdbc:dbase:"),11);
}
// -----------------------------------------------------------------------------
Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
@@ -89,28 +89,28 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O
::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< ::rtl::OUString > aBoolean(2);
- aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
- aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
+ aBoolean[0] = ::rtl::OUString("0");
+ aBoolean[1] = ::rtl::OUString("1");
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet of the database."))
+ ::rtl::OUString("CharSet")
+ ,::rtl::OUString("CharSet of the database.")
,sal_False
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Display inactive records."))
+ ::rtl::OUString("ShowDeleted")
+ ,::rtl::OUString("Display inactive records.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EnableSQL92Check"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Use SQL92 naming constraints."))
+ ::rtl::OUString("EnableSQL92Check")
+ ,::rtl::OUString("Use SQL92 naming constraints.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 458afcc..0d2c846 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -377,7 +377,7 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd
::rtl::OUString sDir = m_pTable->getConnection()->getURL();
sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
sDir += m_Name;
- sDir += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ndx"));
+ sDir += ::rtl::OUString(".ndx");
return sDir;
}
//------------------------------------------------------------------
@@ -390,7 +390,7 @@ void ODbaseIndex::createINFEntry()
::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
sCfgFile += m_pTable->getName();
- sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
+ sCfgFile += ::rtl::OUString(".inf");
rtl::OUString sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath);
@@ -433,7 +433,7 @@ sal_Bool ODbaseIndex::DropImpl()
::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
sCfgFile += m_pTable->getName();
- sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
+ sCfgFile += ::rtl::OUString(".inf");
rtl::OUString sPhysicalPath;
OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath),
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index cc721de..9ba9b5c 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -51,7 +51,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
::rtl::OUString sFile = m_pTable->getConnection()->getURL();
sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
sFile += _rName;
- sFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ndx"));
+ sFile += ::rtl::OUString(".ndx");
if ( !UCBContentHelper::Exists(sFile) )
{
const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 4e473a0..7207a3a 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -57,14 +57,14 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.dbase.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.dbase.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
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;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3213aee..18d531e 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -358,13 +358,13 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
{
case 'C':
eType = DataType::VARCHAR;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
+ aTypeName = ::rtl::OUString("VARCHAR");
break;
case 'F':
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
+ aTypeName = ::rtl::OUString("DECIMAL");
case 'N':
if ( aDBFColumn.db_typ == 'N' )
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC"));
+ aTypeName = ::rtl::OUString("NUMERIC");
eType = DataType::DECIMAL;
// for numeric fields two characters more are written, than the precision of the column description predescribes,
@@ -374,40 +374,40 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
break;
case 'L':
eType = DataType::BIT;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOLEAN"));
+ aTypeName = ::rtl::OUString("BOOLEAN");
break;
case 'Y':
bIsCurrency = sal_True;
eType = DataType::DOUBLE;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
+ aTypeName = ::rtl::OUString("DOUBLE");
break;
case 'D':
eType = DataType::DATE;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
+ aTypeName = ::rtl::OUString("DATE");
break;
case 'T':
eType = DataType::TIMESTAMP;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
+ aTypeName = ::rtl::OUString("TIMESTAMP");
break;
case 'I':
eType = DataType::INTEGER;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTEGER"));
+ aTypeName = ::rtl::OUString("INTEGER");
break;
case 'M':
if ( bFoxPro && ( aDBFColumn.db_frei2[0] & 0x04 ) == 0x04 )
{
eType = DataType::LONGVARBINARY;
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARBINARY"));
+ aTypeName = ::rtl::OUString("LONGVARBINARY");
}
else
{
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR"));
+ aTypeName = ::rtl::OUString("LONGVARCHAR");
eType = DataType::LONGVARCHAR;
}
nPrecision = 2147483647;
break;
case 'P':
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARBINARY"));
+ aTypeName = ::rtl::OUString("LONGVARBINARY");
eType = DataType::LONGVARBINARY;
nPrecision = 2147483647;
break;
@@ -415,12 +415,12 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
case 'B':
if ( m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto )
{
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
+ aTypeName = ::rtl::OUString("DOUBLE");
eType = DataType::DOUBLE;
}
else
{
- aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARBINARY"));
+ aTypeName = ::rtl::OUString("LONGVARBINARY");
eType = DataType::LONGVARBINARY;
nPrecision = 2147483647;
}
@@ -627,7 +627,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s
::rtl::OUString sName;
::rtl::OUString sExt;
INetURLObject aURL;
- static const ::rtl::OUString s_sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
+ static const ::rtl::OUString s_sSeparator("/");
xDir->beforeFirst();
while(xDir->next())
{
@@ -1049,7 +1049,7 @@ sal_Bool ODbaseTable::CreateImpl()
{
::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
- aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aIdent += ::rtl::OUString("/");
aIdent += m_Name;
aName = aIdent.getStr();
}
@@ -1088,7 +1088,7 @@ sal_Bool ODbaseTable::CreateImpl()
try
{
Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
- aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
+ aContent.executeCommand( rtl::OUString("delete"),bool2any( sal_True ) );
}
catch(const Exception&) // an exception is thrown when no file exists
{
@@ -1116,7 +1116,7 @@ sal_Bool ODbaseTable::CreateImpl()
try
{
Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
- aMemoContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
+ aMemoContent.executeCommand( rtl::OUString("delete"),bool2any( sal_True ) );
}
catch(const Exception&)
{
@@ -1132,7 +1132,7 @@ sal_Bool ODbaseTable::CreateImpl()
{
aURL.setExtension(aExt); // kill dbf file
Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
- aMemoContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
+ aMemoContent.executeCommand( rtl::OUString("delete"),bool2any( sal_True ) );
return sal_False;
}
m_aHeader.db_typ = dBaseIIIMemo;
@@ -1470,7 +1470,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem
try
{
::ucbhelper::Content aDeleteContent( aURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment > () );
- aDeleteContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
+ aDeleteContent.executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
}
catch(const Exception&)
{
@@ -2314,7 +2314,7 @@ namespace
{
::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
- aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aIdent += ::rtl::OUString("/");
aIdent += oldName;
aName = aIdent;
}
@@ -2331,11 +2331,11 @@ namespace
Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
Sequence< PropertyValue > aProps( 1 );
- aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ aProps[0].Name = ::rtl::OUString("Title");
aProps[0].Handle = -1; // n/a
aProps[0].Value = makeAny( ::rtl::OUString(sNewName) );
Sequence< Any > aValues;
- aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),makeAny(aProps) ) >>= aValues;
+ aContent.executeCommand( rtl::OUString("setPropertyValues"),makeAny(aProps) ) >>= aValues;
if(aValues.getLength() && aValues[0].hasValue())
throw Exception();
}
@@ -2496,7 +2496,7 @@ String ODbaseTable::createTempFile()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::createTempFile" );
::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
- aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aIdent += ::rtl::OUString("/");
String sTempName(aIdent);
String sExt;
sExt.AssignAscii(".");
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 73ba907..9505569 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName)
{
ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
- _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
+ _rName,::rtl::OUString("TABLE"));
sdbcx::ObjectType xRet = pRet;
pRet->construct();
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index f505dc6..c8ccbc9 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -52,9 +52,9 @@ void OEvoabCatalog::refreshTables()
{
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ aTypes[0] = ::rtl::OUString("TABLE");
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/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 815e752..1397632 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -53,12 +53,12 @@ using namespace ::com::sun::star::lang;
{
::rtl::OUString aExceptionType = aExceptionType_;
if( aExceptionType.getLength() == 0 )
- aExceptionType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown")) ;
+ aExceptionType = ::rtl::OUString("Unknown") ;
- ::rtl::OUString aTypeLine( RTL_CONSTASCII_USTRINGPARAM("\nType: " ) );
+ ::rtl::OUString aTypeLine( "\nType: " );
aTypeLine += aExceptionType;
- ::rtl::OUString aMessageLine( RTL_CONSTASCII_USTRINGPARAM("\nMessage: " ) );
+ ::rtl::OUString aMessageLine( "\nMessage: " );
aMessageLine += ::rtl::OUString( e.Message );
::rtl::OUString aMsg(aTypeLine);
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 0a89e58..d8322b0 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -198,9 +198,9 @@ namespace connectivity
switch( getFieldType( nCol ) )
{
case DataType::BIT:
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BIT"));
+ return ::rtl::OUString("BIT");
case DataType::VARCHAR:
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
+ return ::rtl::OUString("VARCHAR");
default:
break;
}
@@ -268,9 +268,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
// ****************************************************
// 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(""));
// COLUMN_SIZE
aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
// BUFFER_LENGTH, not used
@@ -292,10 +292,10 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
// 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"));
- aRow[3] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
+ aRow[3] = new ORowSetValueDecorator(::rtl::OUString("TABLE"));
::osl::MutexGuard aGuard( m_aMutex );
initFields();
@@ -449,7 +449,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S
::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
// normally this is "
- ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
+ ::rtl::OUString aVal("\"");
return aVal;
}
// -------------------------------------------------------------------------
@@ -1002,7 +1002,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw
// 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("TABLE"),
// Currently we only support a 'TABLE' nothing more complex
};
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
@@ -1041,7 +1041,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::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());
@@ -1063,7 +1063,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
aRows.push_back(aRow);
@@ -1096,7 +1096,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
// check if any type is given
// when no types are given then we have to return all tables e.g. TABLE
- const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ const ::rtl::OUString aTable("TABLE");
sal_Bool bTableFound = sal_True;
sal_Int32 nLength = types.getLength();
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 70c39f8..a0af2aa 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -89,7 +89,7 @@ void OEvoabDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME));
+ return rtl::OUString(EVOAB_DRIVER_IMPL_NAME);
// this name is referenced in the configuration and in the evoab.xml
// Please take care when changing it.
}
@@ -100,7 +100,7 @@ Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static( ) th
// which service is supported
// for more information @see com.sun.star.sdbc.Driver
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+ aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
return aSNS;
}
//------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index c6d4ca9..bd09987 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -75,13 +75,13 @@ namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.evoab.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.evoab.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
return aSupported;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 88996b1..47552d1 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -51,7 +51,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
- static const ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ static const ::rtl::OUString aName("Name");
for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
{
@@ -131,7 +131,7 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
{
- return m_aTableName;//::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ return m_aTableName;//::rtl::OUString("TABLE");
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 7ed9708..bff971b 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -382,7 +382,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
{
// String containing only a '%' and nothing else matches everything
pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
+ rtl::OUString("") );
}
else if( aMatchString.indexOf( WILDCARD ) == -1 )
{ // Simple string , eg. "to match" "contains in evo"
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 8f7416a..c28e8c1 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -56,10 +56,10 @@ using namespace dbtools;
ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName)
{
- ::rtl::OUString aSchema( RTL_CONSTASCII_USTRINGPARAM( "%" ));
+ ::rtl::OUString aSchema( "%" );
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ aTypes[0] = ::rtl::OUString("TABLE");
::rtl::OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 52daf94..fd7ff2f 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -70,7 +70,7 @@ void OFileCatalog::refreshTables()
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
+ ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
fillNames(xResult,aVector);
if(m_pTables)
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 3ba887a..527b50e 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -176,7 +176,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
// set fields to fetch
Sequence< OUString > aProps(1);
OUString* pProps = aProps.getArray();
- pProps[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[ 0 ] = OUString("Title");
try
{
@@ -403,7 +403,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
Reference<XDynamicResultSet> xContent;
Sequence< ::rtl::OUString > aProps(1);
::rtl::OUString* pProps = aProps.getArray();
- pProps[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[ 0 ] = ::rtl::OUString("Title");
try
{
Reference<XContentIdentifier> xIdent = getContent()->getIdentifier();
@@ -446,7 +446,7 @@ void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::O
"$URL$", _rsUrl
);
- aError.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
+ aError.SQLState = ::rtl::OUString("S1000");
aError.ErrorCode = 0;
aError.Context = static_cast< XConnection* >(this);
if (!_rsMessage.isEmpty())
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 5ab1320..6ae185e 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -195,7 +195,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
// check if any type is given
// when no types are given then we have to return all tables e.g. TABLE
- static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ static const ::rtl::OUString aTable("TABLE");
sal_Bool bTableFound = sal_True;
sal_Int32 nLength = types.getLength();
@@ -219,7 +219,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
Reference<XDynamicResultSet> xContent = m_pConnection->getDir();
Reference < XSortedDynamicResultSetFactory > xSRSFac(
- m_pConnection->getDriver()->getFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), UNO_QUERY );
+ m_pConnection->getDriver()->getFactory()->createInstance( ::rtl::OUString("com.sun.star.ucb.SortedDynamicResultSetFactory") ), UNO_QUERY );
Sequence< NumberedSortingInfo > aSortInfo( 1 );
NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -249,7 +249,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
{
aName = xRow->getString(1);
aURL.SetSmartProtocol(INET_PROT_FILE);
- String sUrl = m_pConnection->getURL() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + aName;
+ String sUrl = m_pConnection->getURL() + ::rtl::OUString("/") + aName;
aURL.SetSmartURL( sUrl );
sThisContentExtension = aURL.getExtension();
@@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow[2] = new ORowSetValueDecorator(*pBegin);
aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
- aRow[7] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[7] = new ORowSetValueDecorator(::rtl::OUString("NO"));
aRows.push_back(aRow);
Reference< XPropertySet> xTable;
@@ -549,7 +549,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc
::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
- static const ::rtl::OUString sQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const ::rtl::OUString sQuote("\"");
return sQuote;
}
// -------------------------------------------------------------------------
@@ -709,7 +709,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE
{
ODatabaseMetaDataResultSet::ORow aRow;
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("TABLE")));
aRows.push_back(aRow);
}
pResult->setRows(aRows);
@@ -971,7 +971,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL
::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getURL" );
- static const ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "sdbc:file:" ));
+ static const ::rtl::OUString aValue( "sdbc:file:" );
return aValue;
}
// -------------------------------------------------------------------------
@@ -1050,13 +1050,13 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc
::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getStringFunctions" );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"));
+ return ::rtl::OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getTimeDateFunctions" );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"));
+ return ::rtl::OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException)
@@ -1068,7 +1068,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc
::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getNumericFunctions" );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"));
+ return ::rtl::OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 6f481ec..153288e 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -73,14 +73,14 @@ void OFileDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.driver.file.Driver"));
+ return rtl::OUString("com.sun.star.sdbc.driver.file.Driver");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > OFileDriver::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;
}
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL OFileDriver::acceptsURL( const ::rtl::OUString& url )
throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileDriver::acceptsURL" );
- return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:file:")),10));
+ return (!url.compareTo(::rtl::OUString("sdbc:file:"),10));
}
// --------------------------------------------------------------------------------
Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
@@ -138,47 +138,47 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rt
::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< ::rtl::OUString > aBoolean(2);
- aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
- aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
+ aBoolean[0] = ::rtl::OUString("0");
+ aBoolean[1] = ::rtl::OUString("1");
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet of the database."))
+ ::rtl::OUString("CharSet")
+ ,::rtl::OUString("CharSet of the database.")
,sal_False
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension of the file format."))
+ ::rtl::OUString("Extension")
+ ,::rtl::OUString("Extension of the file format.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*"))
+ ,::rtl::OUString(".*")
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Display inactive records."))
+ ::rtl::OUString("ShowDeleted")
+ ,::rtl::OUString("Display inactive records.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EnableSQL92Check"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Use SQL92 naming constraints."))
+ ::rtl::OUString("EnableSQL92Check")
+ ,::rtl::OUString("Use SQL92 naming constraints.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseRelativePath"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Handle the connection url as relative path."))
+ ::rtl::OUString("UseRelativePath")
+ ,::rtl::OUString("Handle the connection url as relative path.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The URL of the database document which is used to create an absolute path."))
+ ::rtl::OUString("URL")
+ ,::rtl::OUString("The URL of the database document which is used to create an absolute path.")
,sal_False
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 62bce35..f01cc55 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -101,7 +101,7 @@ void OFileTable::refreshColumns()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileTable::refreshColumns" );
TStringVector aVector;
Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(),
- m_SchemaName,m_Name,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+ m_SchemaName,m_Name,::rtl::OUString("%"));
if(xResult.is())
{
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 80c6320..508916a 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -53,7 +53,7 @@ void OFlatCatalog::refreshTables()
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes;
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/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index f9f2411..cd45585 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -78,7 +78,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( )
ODatabaseMetaDataResultSet::ORow aRow;
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("CHAR")));
aRow.push_back(new ORowSetValueDecorator(DataType::CHAR));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -99,60 +99,60 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR"));
aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
aRow[2] = new ORowSetValueDecorator(DataType::DATE);
aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME"));
aRow[2] = new ORowSetValueDecorator(DataType::TIME);
aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
aRow[3] = new ORowSetValueDecorator((sal_Int32)19);
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL"));
aRow[2] = new ORowSetValueDecorator(DataType::BIT);
aRow[3] = ODatabaseMetaDataResultSet::get1Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE"));
aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC"));
aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[15] = new ORowSetValueDecorator((sal_Int32)20);
@@ -232,10 +232,10 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
switch(sal_Int32(aRow[11]->getValue()))
{
case ColumnValue::NO_NULLS:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
break;
case ColumnValue::NULLABLE:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
break;
default:
aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
@@ -257,7 +257,7 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen at sun.com", "OFlatDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:flat:")) + m_pConnection->getURL();
+ return ::rtl::OUString("sdbc:flat:") + m_pConnection->getURL();
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 29252ce..e61463f 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::lang;
//------------------------------------------------------------------------------
rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.flat.ODriver"));
+ return rtl::OUString("com.sun.star.comp.sdbc.flat.ODriver");
}
//------------------------------------------------------------------
@@ -83,7 +83,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
throw(SQLException, RuntimeException)
{
- return url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:flat:")),10) == 0;
+ return url.compareTo(::rtl::OUString("sdbc:flat:"),10) == 0;
}
// -----------------------------------------------------------------------------
Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
@@ -93,42 +93,42 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O
::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< ::rtl::OUString > aBoolean(2);
- aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
- aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
+ aBoolean[0] = ::rtl::OUString("0");
+ aBoolean[1] = ::rtl::OUString("1");
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Field separator."))
+ ::rtl::OUString("FieldDelimiter")
+ ,::rtl::OUString("Field separator.")
,sal_False
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text contains headers."))
+ ::rtl::OUString("HeaderLine")
+ ,::rtl::OUString("Text contains headers.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text separator."))
+ ::rtl::OUString("StringDelimiter")
+ ,::rtl::OUString("Text separator.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Decimal separator."))
+ ::rtl::OUString("DecimalDelimiter")
+ ,::rtl::OUString("Decimal separator.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thousands separator."))
+ ::rtl::OUString("ThousandDelimiter")
+ ,::rtl::OUString("Thousands separator.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"))
+ ,::rtl::OUString("0")
,aBoolean)
);
return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ),
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 3303bb5..7275459 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -54,14 +54,14 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.flat.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.flat.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
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;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index e70e4da..b7f61ed 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -323,13 +323,13 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
if(io_nPrecisions)
{
io_nType = DataType::DECIMAL;
- static const ::rtl::OUString s_sDECIMAL(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
+ static const ::rtl::OUString s_sDECIMAL("DECIMAL");
o_sTypeName = s_sDECIMAL;
}
else
{
io_nType = DataType::DOUBLE;
- static const ::rtl::OUString s_sDOUBLE(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
+ static const ::rtl::OUString s_sDOUBLE("DOUBLE");
o_sTypeName = s_sDOUBLE;
}
}
@@ -348,21 +348,21 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
case NUMBERFORMAT_DATE:
io_nType = DataType::DATE;
{
- static const ::rtl::OUString s_sDATE(RTL_CONSTASCII_USTRINGPARAM("DATE"));
+ static const ::rtl::OUString s_sDATE("DATE");
o_sTypeName = s_sDATE;
}
break;
case NUMBERFORMAT_DATETIME:
io_nType = DataType::TIMESTAMP;
{
- static const ::rtl::OUString s_sTIMESTAMP(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
+ static const ::rtl::OUString s_sTIMESTAMP("TIMESTAMP");
o_sTypeName = s_sTIMESTAMP;
}
break;
case NUMBERFORMAT_TIME:
io_nType = DataType::TIME;
{
- static const ::rtl::OUString s_sTIME(RTL_CONSTASCII_USTRINGPARAM("TIME"));
+ static const ::rtl::OUString s_sTIME("TIME");
o_sTypeName = s_sTIME;
}
break;
@@ -371,7 +371,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
io_nPrecisions = 0; // nyi: Data can be longer!
io_nScales = 0;
{
- static const ::rtl::OUString s_sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
+ static const ::rtl::OUString s_sVARCHAR("VARCHAR");
o_sTypeName = s_sVARCHAR;
}
};
@@ -429,11 +429,11 @@ void OFlatTable::construct()
Sequence< ::com::sun::star::uno::Any > aArg(1);
aArg[0] <<= aAppLocale;
- Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY);
- m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY);
+ Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
+ m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString("com.sun.star.util.NumberFormatter")),UNO_QUERY);
m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
Reference<XPropertySet> xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY);
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
+ xProp->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate;
INetURLObject aURL;
aURL.SetURL(getEntry());
@@ -478,7 +478,7 @@ String OFlatTable::getEntry()
INetURLObject aURL;
xDir->beforeFirst();
- static const ::rtl::OUString s_sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
+ static const ::rtl::OUString s_sSeparator("/");
while(xDir->next())
{
sName = xRow->getString(1);
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index 1a07d1f..e5ce151 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OFlatTables::createObject(const ::rtl::OUString& _rName)
{
OFlatTable* pRet = new OFlatTable(this,(OFlatConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
- _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
+ _rName,::rtl::OUString("TABLE"));
sdbcx::ObjectType xRet = pRet;
pRet->construct();
return xRet;
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 42e1c85..cffa730 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -64,7 +64,7 @@ OHSQLColumn::OHSQLColumn( sal_Bool _bCase)
// -------------------------------------------------------------------------
void OHSQLColumn::construct()
{
- m_sAutoIncrement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IDENTITY"));
+ m_sAutoIncrement = ::rtl::OUString("IDENTITY");
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
}
// -----------------------------------------------------------------------------
@@ -81,7 +81,7 @@ void OHSQLColumn::construct()
Sequence< ::rtl::OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column");
return aSupported;
}
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 8aebe8e..cd3c8db 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -138,8 +138,8 @@ namespace connectivity
{
if ( !m_xDriver.is() )
{
- ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("jdbc:hsqldb:db"));
- Reference<XDriverAccess> xDriverAccess(m_xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager")) ),UNO_QUERY);
+ ::rtl::OUString sURL("jdbc:hsqldb:db");
+ Reference<XDriverAccess> xDriverAccess(m_xFactory->createInstance(::rtl::OUString("com.sun.star.sdbc.DriverManager") ),UNO_QUERY);
OSL_ENSURE(xDriverAccess.is(),"Could not load driver manager!");
if ( xDriverAccess.is() )
m_xDriver = xDriverAccess->getDriverByURL(sURL);
@@ -231,42 +231,42 @@ namespace connectivity
::rtl::OUString sKey = StorageContainer::registerStorage( xStorage, sConnPartURL );
aProperties.put( "storage_key", sKey );
aProperties.put( "storage_class_name",
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.comp.hsqldb.StorageAccess" ) ) );
+ ::rtl::OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageAccess" ) );
aProperties.put( "fileaccess_class_name",
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess" ) ) );
+ ::rtl::OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess" ) );
// JDBC driver and driver's classpath
aProperties.put( "JavaDriverClass",
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.hsqldb.jdbcDriver" ) ) );
+ ::rtl::OUString( "org.hsqldb.jdbcDriver" ) );
aProperties.put( "JavaDriverClassPath",
::rtl::OUString(
#ifdef SYSTEM_HSQLDB
- RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR
- " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
+ HSQLDB_JAR
+ " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar"
#else
- RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar"
- " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
+ "vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar"
+ " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar"
#endif
) );
// auto increment handling
aProperties.put( "IsAutoRetrievingEnabled", true );
aProperties.put( "AutoRetrievingStatement",
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CALL IDENTITY()" ) ) );
+ ::rtl::OUString( "CALL IDENTITY()" ) );
aProperties.put( "IgnoreDriverPrivileges", true );
// don't want to expose HSQLDB's schema capabilities which exist since 1.8.0RC10
aProperties.put( "default_schema",
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+ ::rtl::OUString( "true" ) );
// security: permitted Java classes
NamedValue aPermittedClasses(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hsqldb.method_class_names" ) ),
+ ::rtl::OUString( "hsqldb.method_class_names" ),
makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) )
);
aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
- const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) );
+ const ::rtl::OUString sProperties( "properties" );
::rtl::OUString sMessage;
try
{
@@ -332,17 +332,17 @@ namespace connectivity
if ( xProp.is() )
{
sal_Int32 nMode = 0;
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode"))) >>= nMode;
+ xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nMode;
if ( (nMode & ElementModes::WRITE) != ElementModes::WRITE )
{
- aProperties.put( "readonly", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+ aProperties.put( "readonly", ::rtl::OUString( "true" ) );
}
}
Sequence< PropertyValue > aConnectionArgs;
aProperties >>= aConnectionArgs;
- ::rtl::OUString sConnectURL(RTL_CONSTASCII_USTRINGPARAM("jdbc:hsqldb:"));
+ ::rtl::OUString sConnectURL("jdbc:hsqldb:");
sConnectURL += sConnPartURL;
Reference<XConnection> xOrig;
@@ -382,7 +382,7 @@ namespace connectivity
static Reference< XTerminateListener> s_xTerminateListener;
if( !s_xTerminateListener.is() )
{
- Reference< XDesktop > xDesktop( m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
+ Reference< XDesktop > xDesktop( m_xFactory->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") ), UNO_QUERY );
if( xDesktop.is() )
{
@@ -421,24 +421,24 @@ namespace connectivity
return Sequence< DriverPropertyInfo >();
::std::vector< DriverPropertyInfo > aDriverInfo;
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines the storage where the database will be stored."))
+ ::rtl::OUString("Storage")
+ ,::rtl::OUString("Defines the storage where the database will be stored.")
,sal_True
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines the url of the data source."))
+ ::rtl::OUString("URL")
+ ,::rtl::OUString("Defines the url of the data source.")
,sal_True
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines the statement which will be executed to retrieve auto increment values."))
+ ::rtl::OUString("AutoRetrievingStatement")
+ ,::rtl::OUString("Defines the statement which will be executed to retrieve auto increment values.")
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CALL IDENTITY()"))
+ ,::rtl::OUString("CALL IDENTITY()")
,Sequence< ::rtl::OUString >())
);
return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
@@ -500,14 +500,14 @@ namespace connectivity
//------------------------------------------------------------------------------
rtl::OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.comp.hsqldb.Driver"));
+ return rtl::OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > ODriverDelegator::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;
}
//------------------------------------------------------------------
@@ -551,12 +551,12 @@ namespace connectivity
Reference<XStatement> xStmt = _xConnection->createStatement();
if ( xStmt.is() )
{
- Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'"))),UNO_QUERY);
+ Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
Reference<XRow> xRow(xRes,UNO_QUERY);
if ( xRow.is() && xRes->next() )
bLastOne = xRow->getInt(1) == 1;
if ( bLastOne )
- xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SHUTDOWN")));
+ xStmt->execute(::rtl::OUString("SHUTDOWN"));
}
}
}
@@ -661,7 +661,7 @@ namespace connectivity
Reference< XStatement> xStmt = xConnection->createStatement();
OSL_ENSURE( xStmt.is(), "ODriverDelegator::preCommit: no statement!" );
if ( xStmt.is() )
- xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SET WRITE_DELAY 0" ) ) );
+ xStmt->execute( ::rtl::OUString( "SET WRITE_DELAY 0" ) );
sal_Bool bPreviousAutoCommit = xConnection->getAutoCommit();
xConnection->setAutoCommit( sal_False );
@@ -669,7 +669,7 @@ namespace connectivity
xConnection->setAutoCommit( bPreviousAutoCommit );
if ( xStmt.is() )
- xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SET WRITE_DELAY 60" ) ) );
+ xStmt->execute( ::rtl::OUString( "SET WRITE_DELAY 60" ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list