summaryrefslogtreecommitdiffstats
path: root/connectivity/source
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-19 19:30:57 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-19 19:30:57 +0100
commit0a994bff157dfdd9a879017e8ac11233cb9a7bc9 (patch)
treead5a56ba65562f1a2cd947e6d303c2c76de47176 /connectivity/source
parentTL_CONSTASCII_USTRINGPARAM in libs core 20 (diff)
downloadcore-0a994bff157dfdd9a879017e8ac11233cb9a7bc9.tar.gz
core-0a994bff157dfdd9a879017e8ac11233cb9a7bc9.zip
TL_CONSTASCII_USTRINGPARAM in libs core 21
Diffstat (limited to 'connectivity/source')
-rw-r--r--connectivity/source/drivers/evoab/LColumnAlias.cxx2
-rw-r--r--connectivity/source/drivers/evoab/LConfigAccess.cxx4
-rw-r--r--connectivity/source/drivers/evoab/LDriver.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.cxx2
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HUser.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HUsers.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MConfigAccess.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MConnection.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MDriver.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YUser.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YUsers.cxx2
-rw-r--r--connectivity/source/parse/sqlbison.y6
-rw-r--r--connectivity/source/parse/sqlflex.l2
20 files changed, 25 insertions, 25 deletions
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 88ebe9561144..7d005bbf5fbe 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -113,7 +113,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
// the config path for our own driver's settings
Reference< XPropertySet > xEvoDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() );
//Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, mozab::OConnection::getDriverImplementationName() );
- Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver") );
+ Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver")) );
if ( xEvoDriverNode.is() && xMozDriverNode.is() )
{
try
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index e24bfbe3d8e8..2181de964ac4 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -59,10 +59,10 @@ namespace connectivity
if ( xConfigProvider.is() )
{
- ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" );
+ ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM ("/org.openoffice.Office.DataAccess/DriverSettings/" ));
sCompleteNodePath += _sDriverImplementationName;
//sCompleteNodePath += OEvoabConnection::getDriverImplementationName();
- //sCompleteNodePath += ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver");
+ //sCompleteNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver"));
EVO_TRACE_STRING("createDriverConfigNode()::sCompleteNodePath = %s\n", sCompleteNodePath );
//=========================================================
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 9b61047626ee..637203e787d9 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -77,7 +77,7 @@ OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory)
//------------------------------------------------------------------------------
rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii(EVOAB_DRIVER_IMPL_NAME);
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME));
}
//------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index b401f7045b59..4aed0b3ee05a 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -464,7 +464,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S
::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
// normally this is "
- ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+ ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
return aVal;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index f54058804cf1..bee973cfd6a6 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -91,7 +91,7 @@ void OEvoabDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii(EVOAB_DRIVER_IMPL_NAME);
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME));
// this name is referenced in the configuration and in the evoab.xml
// Please take care when changing it.
}
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 50db08d04773..391e7ec0a623 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -551,7 +551,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc
::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
- static const ::rtl::OUString sQuote = ::rtl::OUString::createFromAscii("\"");
+ static const ::rtl::OUString sQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
return sQuote;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 14768186173d..ac53b47a4f9a 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -811,7 +811,7 @@ namespace connectivity
// arguments for creating the config access
Sequence< Any > aArguments(2);
// the path to the node to open
- ::rtl::OUString sNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Setup/L10N" );
+ ::rtl::OUString sNodePath(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/L10N" ));
aArguments[0] <<= PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), 0,
makeAny( sNodePath ), PropertyState_DIRECT_VALUE
);
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 9b54d55cddf5..a433ed0c34a3 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -292,7 +292,7 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/,
::rtl::OUString sAlterPwd;
sAlterPwd = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET PASSWORD FOR "));
sAlterPwd += m_Name;
- sAlterPwd += ::rtl::OUString::createFromAscii("@\"%\" = PASSWORD('") ;
+ sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("@\"%\" = PASSWORD('")) ;
sAlterPwd += newPassword;
sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ;
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 1e148da07d1a..a99d62bb7d64 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -85,7 +85,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sUserName( _rForName );
aSql += ::dbtools::quoteName(aQuote,sUserName)
- + ::rtl::OUString::createFromAscii(" @\"%\" ");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" @\"%\" "));
::rtl::OUString sPassword;
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
if ( sPassword.getLength() )
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index df0f97fa1aa7..e27ce35bce04 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -220,7 +220,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLE
::rtl::OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException)
{
// normally this is "
- ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+ ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
return aVal;
}
// -------------------------------------------------------------------------
@@ -585,7 +585,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(S
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
{
- ::rtl::OUString aValue = ::rtl::OUString::createFromAscii(KAB_DRIVER_VERSION);
+ ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM(KAB_DRIVER_VERSION));
return aValue;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 129e8d6c2020..896a5ca04c91 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQ
::rtl::OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException)
{
// normally this is "
- ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+ ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
return aVal;
}
// -------------------------------------------------------------------------
@@ -582,7 +582,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
{
- ::rtl::OUString aValue = ::rtl::OUString::createFromAscii(MACAB_DRIVER_VERSION);
+ ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM(MACAB_DRIVER_VERSION));
return aValue;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 0e4d36fe4daa..1ef4cf3ebe74 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -58,7 +58,7 @@ namespace connectivity
if ( xConfigProvider.is() )
{
- ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" );
+ ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/" ));
sCompleteNodePath += OConnection::getDriverImplementationName();
//=========================================================
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 68a2349a347e..9a36f943ff2c 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -101,7 +101,7 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme )
// -----------------------------------------------------------------------------
::rtl::OUString OConnection::getDriverImplementationName()
{
- return rtl::OUString::createFromAscii(MOZAB_DRIVER_IMPL_NAME);
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME));
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 85a0b64f6437..b345c5fafa25 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -93,7 +93,7 @@ void MozabDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii(MOZAB_DRIVER_IMPL_NAME);
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME));
// this name is referenced in the configuration and in the mozab.xml
// Please take care when changing it.
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index b4cc37bb2f03..c7ca9e1287ff 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -97,7 +97,7 @@ void MozillaBootstrap::disposing()
//------------------------------------------------------------------------------
rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii(MOZAB_MozillaBootstrap_IMPL_NAME);
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_MozillaBootstrap_IMPL_NAME));
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index af4107f4eff9..5a731bdd8376 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -167,7 +167,7 @@ namespace
if (product == MozillaProductType_Default)
return ::rtl::OUString();
- return getRegistryDir(product) + ::rtl::OUString::createFromAscii(APP_REGISTRY_NAME);
+ return getRegistryDir(product) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(APP_REGISTRY_NAME));
}
#endif
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index b7af479c43c3..01cb1cbda515 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -291,7 +291,7 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/
::rtl::OUString sAlterPwd;
sAlterPwd = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET PASSWORD FOR "));
sAlterPwd += m_Name;
- sAlterPwd += ::rtl::OUString::createFromAscii("@\"%\" = PASSWORD('") ;
+ sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("@\"%\" = PASSWORD('")) ;
sAlterPwd += newPassword;
sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ;
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index c9738aa16f5e..ce0273ccd664 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -85,7 +85,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sUserName( _rForName );
aSql += ::dbtools::quoteName(aQuote,sUserName)
- + ::rtl::OUString::createFromAscii(" @\"%\" ");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" @\"%\" "));
::rtl::OUString sPassword;
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
if ( sPassword.getLength() )
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index e11a0c7aa4cd..c324c7d16b07 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4311,7 +4311,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral)
//-----------------------------------------------------------------------------
sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral)
{
- OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString::createFromAscii("="), SQL_NODE_EQUAL);
+ OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")), SQL_NODE_EQUAL);
return buildPredicateRule(pAppend,pLiteral,pComp);
}
@@ -4340,7 +4340,7 @@ void OSQLParser::error(sal_Char *fmt)
if(!m_sErrorMessage.getLength())
{
::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
- ::rtl::OUString sSQL_TOKEN(::rtl::OUString::createFromAscii("SQL_TOKEN_"));
+ ::rtl::OUString sSQL_TOKEN(RTL_CONSTASCII_USTRINGPARAM("SQL_TOKEN_"));
sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN);
if(nPos1 != -1)
@@ -4364,7 +4364,7 @@ void OSQLParser::error(sal_Char *fmt)
::rtl::OUString aError = s_pScanner->getErrorMessage();
if(aError.getLength())
{
- m_sErrorMessage += ::rtl::OUString::createFromAscii(", ");
+ m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
m_sErrorMessage += aError;
}
}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index c6723dfd6869..8a4f5e577908 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -709,7 +709,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
if (m_nCurrentPos < m_sStatement.getLength())
{
- m_sErrorMessage += ::rtl::OUString::createFromAscii(": ");
+ m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": "));
::rtl::OUString aError;
static sal_Int32 BUFFERSIZE = 256;