summaryrefslogtreecommitdiff
path: root/vcl/generic/print/text_gfx.cxx
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/generic/print/text_gfx.cxx
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/generic/print/text_gfx.cxx')
-rw-r--r--vcl/generic/print/text_gfx.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 633b7421b612..841a9db7a355 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -118,7 +118,7 @@ PrinterGfx::SetFont(
// font and encoding will be set by drawText again immediately
// before PSShowText
mnFontID = nFontID;
- maVirtualStatus.maFont = rtl::OString();
+ maVirtualStatus.maFont = OString();
maVirtualStatus.maEncoding = RTL_TEXTENCODING_DONTKNOW;
maVirtualStatus.mnTextHeight = nHeight;
maVirtualStatus.mnTextWidth = nWidth;
@@ -531,13 +531,13 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
// they are installed on displays and printers, but get not embedded in
// print files or documents because they are not licensed for use outside
// the company.
- rtl::OString aMessage( "The font " );
- aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID),
+ OString aMessage( "The font " );
+ aMessage += OUStringToOString( mrFontMgr.getPSName(mnFontID),
RTL_TEXTENCODING_ASCII_US );
aMessage += " could not be downloaded\nbecause its license does not allow for that";
PSComment( aMessage.getStr() );
- rtl::OString aFontName = rtl::OUStringToOString(
+ OString aFontName = OUStringToOString(
mrFontMgr.getPSName(mnFontID),
RTL_TEXTENCODING_ASCII_US);
PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1);
@@ -706,21 +706,21 @@ PrinterGfx::OnEndJob ()
}
void
-PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts )
+PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts )
{
// write all type 1 fonts
std::list< sal_Int32 >::iterator aFont;
// already in the document header ?
for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont)
{
- const rtl::OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) );
- rtl::OUString aUNCPath;
+ const OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) );
+ OUString aUNCPath;
osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath);
osl::File aFontFile (aUNCPath);
// provide the pfb or pfa font as a (pfa-)font resource
- rtl::OString aPostScriptName =
- rtl::OUStringToOString ( mrFontMgr.getPSName(*aFont),
+ OString aPostScriptName =
+ OUStringToOString ( mrFontMgr.getPSName(*aFont),
RTL_TEXTENCODING_ASCII_US );
WritePS (pFile, "%%BeginResource: font ");
@@ -763,7 +763,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli
aIter->PSUploadEncoding (pFile, *this);
if( aIter->GetFontType() == fonttype::Builtin )
rNeededFonts.push_back(
- rtl::OUStringToOString(
+ OUStringToOString(
mrFontMgr.getPSName( aIter->GetFontID() ),
RTL_TEXTENCODING_ASCII_US ) );
}