Merge branch 'master' into feature/gnumake4

Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk

1 files changed, 32 insertions, 30 deletions

diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 9913fbe963fd..01cb1cbda515 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,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;
 
@@ -237,12 +238,12 @@ void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_I
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("GRANT ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANT "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" TO ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -267,12 +268,12 @@ void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("REVOKE ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REVOKE "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" FROM ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -288,11 +289,11 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
     ::rtl::OUString sAlterPwd;
-    sAlterPwd = ::rtl::OUString::createFromAscii("SET PASSWORD FOR ");
+    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::createFromAscii("')") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ;
 
 
     Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -307,44 +308,45 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/
 {
     ::rtl::OUString sPrivs;
     if((nRights & Privilege::INSERT) == Privilege::INSERT)
-        sPrivs += ::rtl::OUString::createFromAscii("INSERT");
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"));
 
     if((nRights & Privilege::DELETE) == Privilege::DELETE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("DELETE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"));
     }
 
     if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("UPDATE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"));
     }
 
     if((nRights & Privilege::ALTER) == Privilege::ALTER)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("ALTER");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"));
     }
 
     if((nRights & Privilege::SELECT) == Privilege::SELECT)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("SELECT");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
     }
 
     if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("REFERENCES");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES"));
     }
 
     return sPrivs;
 }
 // -----------------------------------------------------------------------------
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */