summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/mysql
diff options
context:
space:
mode:
authorKevin Hunter <hunteke@earlham.edu>2010-11-09 14:55:22 -0500
committerDavid Tardon <dtardon@redhat.com>2010-11-10 08:19:12 +0100
commit601bfe023f5aeb9b10f4c17d50d18f9b7455f229 (patch)
tree22fa377c3b0de213eda4d616600749c5e1ccad31 /connectivity/source/drivers/mysql
parente30c45f22519a413f6fb08adb5307b2b610e5c28 (diff)
EasyHack: Convert to RTL macro from FromAscii
Diffstat (limited to 'connectivity/source/drivers/mysql')
-rw-r--r--connectivity/source/drivers/mysql/YTable.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YTables.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YUser.cxx20
-rw-r--r--connectivity/source/drivers/mysql/YUsers.cxx4
-rw-r--r--connectivity/source/drivers/mysql/YViews.cxx4
5 files changed, 16 insertions, 16 deletions
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index f40a348db09e..8d453979f681 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -352,7 +352,7 @@ void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
// -----------------------------------------------------------------------------
::rtl::OUString OMySQLTable::getAlterTableColumnPart()
{
- ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+ ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sComposedName(
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 7248e3a7327d..26dfb19dfcdb 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -157,7 +157,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
+ ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP " ));
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString::createFromAscii("VIEW");
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 0cdd1bf5e8c4..b8b4f830c79d 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -131,16 +131,16 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName
if ( xRes.is() )
{
- static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT");
- static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT");
- static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE");
- static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE");
- static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ");
- static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE");
- static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER");
- static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE");
- static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP");
- static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES");
+ static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
+ static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
+ static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
+ static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
+ static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
+ static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
+ static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
+ static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
+ static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
+ static const ::rtl::OUString sYes( RTL_CONSTASCII_USTRINGPARAM( "YES" ));
nRightsWithGrant = nRights = 0;
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index da6e024fef62..05ba70939844 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -81,7 +81,7 @@ Reference< XPropertySet > OUsers::createDescriptor()
// XAppend
sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
{
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO ");
+ ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "GRANT USAGE ON * TO " ));
::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sUserName( _rForName );
aSql += ::dbtools::quoteName(aQuote,sUserName)
@@ -106,7 +106,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
// XDrop
void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
{
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM ");
+ ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "REVOKE ALL ON * FROM " ));
::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( );
aSql += ::dbtools::quoteName(aQuote,_sElementName);
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 767ae19cdb48..80c691cfbfe9 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -113,7 +113,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
if (!bIsNew)
{
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW");
+ ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP VIEW" ));
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true );
@@ -136,7 +136,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
{
Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW ");
+ ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " ));
::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sSchema,sCommand;