From 08b9817b778a64b63a83744ac8b309bbed743f00 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Tue, 12 Mar 2013 14:23:48 -0300 Subject: Removal finished of CreateFromAscii MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf Reviewed-on: https://gerrit.libreoffice.org/2685 Reviewed-by: Luboš Luňák Tested-by: Luboš Luňák --- vcl/unx/generic/app/salinst.cxx | 6 +++--- vcl/workben/outdevgrind.cxx | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index b234b8b7bee4..af958fb9570a 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -292,9 +292,9 @@ void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths ) 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 3c0d3750a4c2..bec832a0c1fa 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -892,8 +892,7 @@ sal_uInt16 GrindApp::Exception( sal_uInt16 nError ) 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; -- cgit v1.2.3