[Libreoffice-commits] .: vcl/headless
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 20 05:41:35 PST 2012
vcl/headless/headlessinst.cxx | 22 +++++++++++-----------
vcl/headless/svpdummies.cxx | 8 ++++----
vcl/headless/svpinst.cxx | 2 +-
vcl/headless/svpprn.cxx | 11 ++++-------
vcl/headless/svptext.cxx | 4 ++--
5 files changed, 22 insertions(+), 25 deletions(-)
New commits:
commit 6cd49f7f225a28a1f5e79a47f809ecb13761ef7a
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date: Wed Dec 19 19:57:10 2012 +0100
vcl/headless: remove rtl namespace prefix from OUstring methods
Change-Id: Ic3948384bc1709d648507c41542c34437abea468
Reviewed-on: https://gerrit.libreoffice.org/1422
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
Tested-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 7793d85..312f763 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -52,15 +52,15 @@ class HeadlessSalSystem : public SvpSalSystem {
public:
HeadlessSalSystem() : SvpSalSystem() {}
virtual ~HeadlessSalSystem() {}
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton )
{
(void)rButtons; (void)nDefButton;
::fprintf(stdout, "LibreOffice - dialog '%s': '%s'",
- rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
return 0;
}
};
@@ -84,15 +84,15 @@ void DeInitSalData() {}
void InitSalMain() {}
void DeInitSalMain() {}
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
- rtl::OUString aError( rErrorText );
+ OUString aError( rErrorText );
if( aError.isEmpty() )
- aError = rtl::OUString::createFromAscii("Unknown application error");
- ::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
+ aError = OUString::createFromAscii("Unknown application error");
+ ::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
::fprintf( stderr, "SalAbort: '%s'",
- rtl::OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr());
+ OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr());
if( bDumpCore )
abort();
else
@@ -101,7 +101,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
const OUString& SalGetDesktopEnvironment()
{
- static rtl::OUString aEnv( RTL_CONSTASCII_USTRINGPARAM( "headless" ) );
+ static OUString aEnv( RTL_CONSTASCII_USTRINGPARAM( "headless" ) );
return aEnv;
}
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index b405f27..c71f041 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -69,16 +69,16 @@ Rectangle SvpSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre
return GetDisplayScreenPosSizePixel( nScreen );
}
-rtl::OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
+OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
- rtl::OUStringBuffer aBuf( 32 );
+ OUStringBuffer aBuf( 32 );
aBuf.appendAscii( "VirtualScreen " );
aBuf.append( sal_Int32(nScreen) );
return aBuf.makeStringAndClear();
}
-int SvpSalSystem::ShowNativeDialog( const rtl::OUString&, const rtl::OUString&,
- const std::list< rtl::OUString >&, int )
+int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
+ const std::list< OUString >&, int )
{
return 0;
}
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 6d7c6a9..5d6d5b9 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -371,7 +371,7 @@ void SvpSalInstance::StartTimer( sal_uLong nMS )
}
}
-void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+void SvpSalInstance::AddToRecentDocumentList(const OUString&, const OUString&)
{
}
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index d711bcd..d769847 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -34,16 +34,13 @@
using namespace psp;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-
/*
* static helpers
*/
-static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
+static OUString getPdfDir( const PrinterInfo& rInfo )
{
- rtl::OUString aDir;
+ OUString aDir;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
@@ -53,7 +50,7 @@ static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
sal_Int32 nPos = 0;
aDir = aToken.getToken( 1, '=', nPos );
if( aDir.isEmpty() )
- aDir = rtl::OStringToOUString( rtl::OString( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
+ aDir = OStringToOUString( OString( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
break;
}
}
@@ -255,7 +252,7 @@ void SvpSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
{
}
-rtl::OUString SvpSalInstance::GetDefaultPrinter()
+OUString SvpSalInstance::GetDefaultPrinter()
{
PrinterInfoManager& rManager( PrinterInfoManager::get() );
return rManager.getDefaultPrinter();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index a97b077..834f6a0 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -367,7 +367,7 @@ void SvpSalGraphics::GetDevFontSubstList( OutputDevice* )
// ---------------------------------------------------------------------------
bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
- const rtl::OUString&, const rtl::OUString& )
+ const OUString&, const OUString& )
{
return false;
}
@@ -375,7 +375,7 @@ bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
// ---------------------------------------------------------------------------
sal_Bool SvpSalGraphics::CreateFontSubset(
- const rtl::OUString& rToFile,
+ const OUString& rToFile,
const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
More information about the Libreoffice-commits
mailing list