[Libreoffice-commits] core.git: vcl/unx vcl/workben
Ricardo Montania
ricardo at linuxafundo.com.br
Tue Mar 12 10:36:00 PDT 2013
vcl/unx/generic/app/salinst.cxx | 6 +++---
vcl/workben/outdevgrind.cxx | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 08b9817b778a64b63a83744ac8b309bbed743f00
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Tue Mar 12 14:23:48 2013 -0300
Removal finished of CreateFromAscii
Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Reviewed-on: https://gerrit.libreoffice.org/2685
Reviewed-by: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Tested-by: LuboÅ¡ LuÅák <l.lunak at suse.cz>
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 @@ 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 3c0d375..bec832a 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;
More information about the Libreoffice-commits
mailing list