summaryrefslogtreecommitdiff
path: root/vcl/headless
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/headless
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/headless')
-rw-r--r--vcl/headless/svpelement.cxx8
-rw-r--r--vcl/headless/svpframe.cxx6
-rw-r--r--vcl/headless/svpgdi.cxx2
-rw-r--r--vcl/headless/svptext.cxx2
4 files changed, 9 insertions, 9 deletions
diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx
index 5458fe8a7539..8b6f3604ca41 100644
--- a/vcl/headless/svpelement.cxx
+++ b/vcl/headless/svpelement.cxx
@@ -158,21 +158,21 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket )
{
int nFile = (int)pSocket;
- rtl::OStringBuffer aBuf( 256 ), aAnswer( 256 );
+ OStringBuffer aBuf( 256 ), aAnswer( 256 );
char c;
while( read( nFile, &c, 1 ) && c != '\n' )
aBuf.append( sal_Char(c) );
- rtl::OString aCommand( aBuf.makeStringAndClear() );
+ OString aCommand( aBuf.makeStringAndClear() );
if( aCommand.startsWith( "list" ) )
{
- boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash > aMap;
+ boost::unordered_map< OString, std::list<SvpElement*>, OStringHash > aMap;
for( std::list< SvpElement* >::const_iterator it = m_aElements.begin();
it != m_aElements.end(); ++it )
{
std::list<SvpElement*>& rList = aMap[matchType(*it)];
rList.push_back( *it );
}
- for( boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash>::const_iterator hash_it = aMap.begin();
+ for( boost::unordered_map< OString, std::list<SvpElement*>, OStringHash>::const_iterator hash_it = aMap.begin();
hash_it != aMap.end(); ++hash_it )
{
aAnswer.append( "ElementType: " );
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 41f4629cf75c..18c84f3ef9e5 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -191,7 +191,7 @@ void SvpSalFrame::PostPaint(bool bImmediate) const
}
}
-void SvpSalFrame::SetTitle( const rtl::OUString& )
+void SvpSalFrame::SetTitle( const OUString& )
{
}
@@ -400,9 +400,9 @@ void SvpSalFrame::EndExtTextInput( sal_uInt16 )
{
}
-rtl::OUString SvpSalFrame::GetKeyName( sal_uInt16 )
+OUString SvpSalFrame::GetKeyName( sal_uInt16 )
{
- return rtl::OUString();
+ return OUString();
}
sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& )
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 96733ec97d8c..2c4412fb2705 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -48,7 +48,7 @@ rDevice
{
#if OSL_DEBUG_LEVEL > 2
static int dbgStreamNum = 0;
- rtl::OStringBuffer aBuf( 256 );
+ OStringBuffer aBuf( 256 );
aBuf.append( "debug" );
mkdir( aBuf.getStr(), 0777 );
aBuf.append( "/" );
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 1e748231b637..717579f8e90a 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -341,7 +341,7 @@ void SvpSalGraphics::GetDevFontList( ImplDevFontList* pDevFontList )
// inform GlyphCache about this font provided by the PsPrint subsystem
ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo );
aDFA.mnQuality += 4096;
- const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
+ const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo );
}