diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2013-03-12 14:23:48 -0300 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 17:35:39 +0000 |
| commit | 08b9817b778a64b63a83744ac8b309bbed743f00 (patch) | |
| tree | 5ae99d70bc0def54a4e5cf288f6d41f4382d75e5 | |
| parent | 8563f011ab4001a77ff1dfaeb74abb5900b1a73c (diff) | |
Removal finished of CreateFromAscii
Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Reviewed-on: https://gerrit.libreoffice.org/2685
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
| -rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 6 | ||||
| -rw-r--r-- | 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; |