[PATCH] Remove now obsolete RTL_CONSTASCII_(U)STRINGPARAM

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2627

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/2627/1

Remove now obsolete RTL_CONSTASCII_(U)STRINGPARAM

Change-Id: I15ae64d621fd0a1fa178f9a4062b93520628bdb0
---
M vcl/unx/generic/app/i18n_im.cxx
M vcl/unx/generic/app/saldata.cxx
M vcl/unx/generic/app/salinst.cxx
M vcl/unx/generic/app/sm.cxx
4 files changed, 20 insertions(+), 20 deletions(-)



diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 9da48e8..430aea2 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -169,10 +169,10 @@
 static void
 SetSystemEnvironment( const rtl::OUString& rLocale )
 {
-    rtl::OUString LC_ALL_Var(RTL_CONSTASCII_USTRINGPARAM("LC_ALL"));
+    OUString LC_ALL_Var("LC_ALL");
     osl_setEnvironment(LC_ALL_Var.pData, rLocale.pData);
 
-    rtl::OUString LANG_Var(RTL_CONSTASCII_USTRINGPARAM("LANG"));
+    OUString LANG_Var("LANG");
     osl_setEnvironment(LANG_Var.pData, rLocale.pData);
 }
 #endif
@@ -229,13 +229,13 @@
             osl_setThreadTextEncoding (RTL_TEXTENCODING_ISO_8859_1);
             locale = SetSystemLocale( "en_US" );
             #ifdef SOLARIS
-            SetSystemEnvironment( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en_US")) );
+            SetSystemEnvironment( "en_US" );
             #endif
             if (! IsXWindowCompatibleLocale(locale))
             {
                 locale = SetSystemLocale( "C" );
                 #ifdef SOLARIS
-                SetSystemEnvironment( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("C")) );
+                SetSystemEnvironment( "C" );
                 #endif
                 if (! IsXWindowCompatibleLocale(locale))
                     mbUseable = False;
@@ -366,7 +366,7 @@
 
         if ((maMethod == (XIM)NULL) && (getenv("XMODIFIERS") != NULL))
         {
-                rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("XMODIFIERS"));
+                OUString envVar("XMODIFIERS");
                 osl_clearEnvironment(envVar.pData);
                 XSetLocaleModifiers("");
                 maMethod = XOpenIM(pDisplay, NULL, NULL, NULL);
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index ed1f036..b7c7ee9 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -435,7 +435,7 @@
                  * the clipboard build another connection
                  * to the xserver using $DISPLAY
                  */
-                rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("DISPLAY"));
+                OUString envVar("DISPLAY");
                 osl_setEnvironment(envVar.pData, aParam.pData);
             }
             break;
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index ed8e216..b234b8b 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -192,7 +192,7 @@
     delete pFrame;
 }
 
-static void getServerDirectories( std::list< rtl::OString >& o_rFontPaths )
+static void getServerDirectories( std::list< OString >& o_rFontPaths )
 {
 #ifdef LINUX
     /*
@@ -201,7 +201,7 @@
     static const char* pCommands[] = {
         "/usr/sbin/chkfontpath 2>/dev/null", "chkfontpath 2>/dev/null"
     };
-    ::std::list< rtl::OString > aLines;
+    ::std::list< OString > aLines;
 
     for( unsigned int i = 0; i < SAL_N_ELEMENTS(pCommands); i++ )
     {
@@ -225,7 +225,7 @@
         }
     }
 
-    for( ::std::list< rtl::OString >::iterator it = aLines.begin(); it != aLines.end(); ++it )
+    for( ::std::list< OString >::iterator it = aLines.begin(); it != aLines.end(); ++it )
     {
         if( ! access( it->getStr(), F_OK ) )
         {
@@ -242,7 +242,7 @@
 
 
 
-void X11SalInstance::FillFontPathList( std::list< rtl::OString >& o_rFontPaths )
+void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths )
 {
     Display *pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay();
 
@@ -301,7 +301,7 @@
         // TODO: replace environment variables
         while( aStream.IsOpen() && ! aStream.IsEof() )
         {
-            rtl::OString aLine;
+            OString aLine;
             aStream.ReadLine( aLine );
             psp::normPath( aLine );
             // try to avoid bad fonts in some cases
@@ -316,11 +316,11 @@
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
-void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& 
rMimeType)
+void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType)
 {
-    const rtl::OUString 
SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
-    const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
-    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+    const OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST("add_to_recently_used_file_list");
+    const OUString LIB_RECENT_FILE("librecentfile.so");
+    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const OUString&, const OUString&);
 
     PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
 
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 6d4b5e5..7cb72e8 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -189,12 +189,12 @@
         pSmProps[ 2 ].vals      = new SmPropValue[3];
         pSmProps[ 2 ].vals[0].length    = aExec.getLength()+1;
         pSmProps[ 2 ].vals[0].value = strdup( aExec.getStr() );
-        rtl::OStringBuffer aRestartOption;
-        aRestartOption.append(RTL_CONSTASCII_STRINGPARAM("--session="));
+        OStringBuffer aRestartOption;
+        aRestartOption.append("--session=");
         aRestartOption.append(SessionManagerClient::getSessionID());
         pSmProps[ 2 ].vals[1].length    = aRestartOption.getLength()+1;
         pSmProps[ 2 ].vals[1].value = strdup(aRestartOption.getStr());
-        rtl::OString aRestartOptionNoLogo(RTL_CONSTASCII_STRINGPARAM("--nologo"));
+        OString aRestartOptionNoLogo("--nologo");
         pSmProps[ 2 ].vals[2].length    = aRestartOptionNoLogo.getLength()+1;
         pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr());
 
@@ -204,7 +204,7 @@
         if( aSec )
         {
             osl_getUserName( aSec, &aUserName.pData );
-            aUser = rtl::OUStringToOString( aUserName, osl_getThreadTextEncoding() );
+            aUser = OUStringToOString( aUserName, osl_getThreadTextEncoding() );
             osl_freeSecurityHandle( aSec );
         }
 
@@ -451,7 +451,7 @@
                 SAL_INFO("vcl.sm", "SmcOpenConnection failed: " << aErrBuf);
             else
                 SAL_INFO("vcl.sm", "SmcOpenConnection succeeded, client ID is " << pClientID );
-            m_aClientID = rtl::OString(pClientID);
+            m_aClientID = OString(pClientID);
             free( pClientID );
             pClientID = NULL;
         }

-- 
To view, visit https://gerrit.libreoffice.org/2627
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ae64d621fd0a1fa178f9a4062b93520628bdb0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>