summaryrefslogtreecommitdiff
path: root/vcl/unx/x11
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/unx/x11
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl/unx/x11')
-rw-r--r--vcl/unx/x11/x11sys.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index d911b5c8205c..66a07753271c 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -90,17 +90,17 @@ Rectangle X11SalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre
return GetDisplayScreenPosSizePixel( nScreen );
}
-rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
+OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
{
- rtl::OUString aScreenName;
+ OUString aScreenName;
SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
if( pSalDisp->IsXinerama() )
{
const std::vector< Rectangle >& rScreens = pSalDisp->GetXineramaScreens();
if( nScreen >= rScreens.size() )
nScreen = 0;
- rtl::OUStringBuffer aBuf( 256 );
- aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
+ OUStringBuffer aBuf( 256 );
+ aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
aBuf.appendAscii( " [" );
aBuf.append( static_cast<sal_Int32>(nScreen) );
aBuf.append( sal_Unicode(']') );
@@ -110,8 +110,8 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
{
if( nScreen >= static_cast<unsigned int>(pSalDisp->GetXScreenCount()) )
nScreen = 0;
- rtl::OUStringBuffer aBuf( 256 );
- aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
+ OUStringBuffer aBuf( 256 );
+ aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
// search backwards for ':'
int nPos = aBuf.getLength();
if( nPos > 0 )
@@ -131,7 +131,7 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
return aScreenName;
}
-int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUString& rMessage, const std::list< rtl::OUString >& rButtons, int nDefButton )
+int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton )
{
int nRet = -1;
@@ -144,7 +144,7 @@ int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUSt
aWarn.Clear();
sal_uInt16 nButton = 0;
- for( std::list< rtl::OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
+ for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
{
aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 );
nButton++;