summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:32:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:51:45 +0200
commite2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch)
tree8063275cabcdf32e30c37451a32d96db5929561a /connectivity
parentd01768c31a0658c8a74e0dd3a95b2d781639d18e (diff)
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/dbtools.cxx4
-rw-r--r--connectivity/source/commontools/dbtools2.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/InputStream.cxx2
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index f362bff17be2..c80fb1f46295 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1030,9 +1030,9 @@ try
{
OSL_UNUSED( e );
#ifdef DBG_UTIL
- OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
+ OUString sMessage("TransferFormComponentProperties : could not transfer the value for property \"");
sMessage += pResult->Name;
- sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+ sMessage += OUString("\"");
OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
#endif
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index df243d3b169c..23b4f53b2036 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -241,7 +241,7 @@ namespace
}
if ( nColCount )
- sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+ sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(")"));
return sSql;
}
}
@@ -364,9 +364,9 @@ OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descri
else
{
if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) )
- aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")"));
else
- aSql += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ aSql += OUString(")");
}
return aSql;
}
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index c274d51f5835..f72cbb763d8a 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::No
sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
{
if (nBytesToRead < 0)
- throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this );
+ throw ::com::sun::star::io::BufferSizeExceededException( OUString( OSL_LOG_PREFIX ), *this );
jint out(0);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index cbac0a065ca2..fa30285f9d7c 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -290,7 +290,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, Runt
OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
// normally this is "
- return OUString( RTL_CONSTASCII_USTRINGPARAM("\""));
+ return OUString( "\"");
}
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 04aeb2225d96..6ccaf5cd32ea 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -258,7 +258,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo"
// So we append ("E-mail" varchar) to the last of it to make it work
{
- return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True);
+ return parseSql(sql + OUString( "(""E-mail"" caracter)"),sal_True);
}
getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );