[PATCH] Removal finished of CreateFromAscii

Ricardo Montania (via Code Review) gerrit at gerrit.libreoffice.org
Tue Mar 12 10:24:41 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2685

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2685/1

Removal finished of CreateFromAscii

Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
---
M vcl/unx/generic/app/salinst.cxx
M vcl/workben/outdevgrind.cxx
2 files changed, 4 insertions(+), 5 deletions(-)



diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index b234b8b..af958fb 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -292,9 +292,9 @@
     const char* lang = getenv("LANG");
     if ( lang != NULL )
     {
-        String aOpenWinDir( String::CreateFromAscii( "/usr/openwin/lib/locale/" ) );
-        aOpenWinDir.AppendAscii( lang );
-        aOpenWinDir.AppendAscii( "/OWfontpath" );
+        OUString aOpenWinDir( "/usr/openwin/lib/locale/" );
+        aOpenWinDir += OUString::createFromAscii( lang );
+        aOpenWinDir += "/OWfontpath";
 
         SvFileStream aStream( aOpenWinDir, STREAM_READ );
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 3c0d375..bec832a 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -892,8 +892,7 @@
     switch( nError & EXC_MAJORTYPE )
     {
         case EXC_RSCNOTLOADED:
-            Abort( String::CreateFromAscii(
-                       "Error: could not load language resources.\nPlease check your installation.\n" ) );
+            Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
             break;
     }
     return 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania <ricardo at linuxafundo.com.br>



More information about the LibreOffice mailing list