diff options
| author | Chris <chris.sherlock79@gmail.com> | 2013-03-13 18:27:50 +1100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-13 08:32:37 +0000 |
| commit | bc7202aad393b17d0e2545001f7f869f683a7ec7 (patch) | |
| tree | 2810c6bd4cbd02284484cebf50392500ae0ee826 /vcl/unx/gtk | |
| parent | Resolves: #i119943 Underline can not work with ";" in format code (diff) | |
| download | core-bc7202aad393b17d0e2545001f7f869f683a7ec7.tar.gz core-bc7202aad393b17d0e2545001f7f869f683a7ec7.zip | |
Remove RTL_CONSTASCII_USTRINGPARAM and remove rtl:: namespace for strings
Change-Id: I7327cfe644cc7c948692dff66f416f85a4e4ae40
Reviewed-on: https://gerrit.libreoffice.org/2693
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 24fdbb6f7afd..e4a35a7f679e 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -631,8 +631,8 @@ void GtkData::Init() // is there a -display command line parameter? rtl_TextEncoding aEnc = osl_getThreadTextEncoding(); int nParams = osl_getCommandArgCount(); - rtl::OString aDisplay; - rtl::OUString aParam, aBin; + OString aDisplay; + OUString aParam, aBin; char** pCmdLineAry = new char*[ nParams+1 ]; osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); @@ -657,10 +657,10 @@ void GtkData::Init() g_set_application_name(SalGenericSystem::getFrameClassName()); // Set consistant name of the root accessible - rtl::OUString aAppName = Application::GetAppName(); + OUString aAppName = Application::GetAppName(); if( !aAppName.isEmpty() ) { - rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc); + OString aPrgName = rtl::OUStringToOString(aAppName, aEnc); g_set_prgname(aPrgName.getStr()); } @@ -681,11 +681,11 @@ void GtkData::Init() pGdkDisp = gdk_display_get_default(); if ( !pGdkDisp ) { - rtl::OUString aProgramFileURL; + OUString aProgramFileURL; osl_getExecutableFile( &aProgramFileURL.pData ); - rtl::OUString aProgramSystemPath; + OUString aProgramSystemPath; osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData); - rtl::OString aProgramName = rtl::OUStringToOString( + OString aProgramName = rtl::OUStringToOString( aProgramSystemPath, osl_getThreadTextEncoding() ); fprintf( stderr, "%s X11 error: Can't open display: %s\n", @@ -703,9 +703,9 @@ void GtkData::Init() * the clipboard build another connection * to the xserver using $DISPLAY */ - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("DISPLAY")); + OUString envVar("DISPLAY"); const gchar *name = gdk_display_get_name( pGdkDisp ); - rtl::OUString envValue(name, strlen(name), aEnc); + OUString envValue(name, strlen(name), aEnc); osl_setEnvironment(envVar.pData, envValue.pData); GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp ); |