[Libreoffice-commits] .: vcl/headless
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 20 12:11:16 PST 2012
vcl/headless/headlessinst.cxx | 4 ++--
vcl/headless/svpdummies.cxx | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 11c4f731813843ca269369d262bb5e0f5c47829f
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date: Thu Dec 20 21:09:32 2012 +0100
vcl/headless: some more string cleanup
As suggested by Olivier Hallot and Lubos Lunak
Change-Id: Ie5d9f379294b004992dab0b98d6dfa4aa5456159
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 312f763..1d1f15e 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -88,7 +88,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
OUString aError( rErrorText );
if( aError.isEmpty() )
- aError = OUString::createFromAscii("Unknown application error");
+ aError = "Unknown application error";
::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
::fprintf( stderr, "SalAbort: '%s'",
@@ -101,7 +101,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
const OUString& SalGetDesktopEnvironment()
{
- static OUString aEnv( RTL_CONSTASCII_USTRINGPARAM( "headless" ) );
+ static OUString aEnv( "headless" );
return aEnv;
}
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index c71f041..68cace8 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -71,10 +71,7 @@ Rectangle SvpSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre
OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
- OUStringBuffer aBuf( 32 );
- aBuf.appendAscii( "VirtualScreen " );
- aBuf.append( sal_Int32(nScreen) );
- return aBuf.makeStringAndClear();
+ return "VirtualScreen " + OUString::valueOf(sal_Int32(nScreen));
}
int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
More information about the Libreoffice-commits
mailing list