vcl/source/gdi/outdev3.cxx | 4 +--
vcl/win/source/gdi/salgdi3.cxx | 50 ++++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 221c71c9c7a13374efdc28a81f7106246011c580
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Mon Mar 11 21:59:53 2013 +0100
vcl: further fixes
introduced due to 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10
Change-Id: I9e3489be57fc8fe3cfcf753a11d926e79bcba3de
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6908c40..d218a80 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2430,8 +2430,8 @@ ImplFontEntry* ImplFontCache::GetFontEntry(
ImplDevFontList* pFontList,
//to see if it's a modern re-coded apple symbol font in case that
//font shows up on a different platform
if (!pEntry->mpConversion &&
- aFontSelData.maTargetName.EqualsIgnoreCaseAscii("symbol") &&
- aFontSelData.maSearchName.EqualsIgnoreCaseAscii("symbol"))
+ aFontSelData.maTargetName.equalsIgnoreCaseAscii("symbol") &&
+ aFontSelData.maSearchName.equalsIgnoreCaseAscii("symbol"))
{
pEntry->mpConversion = ConvertChar::GetRecodeData(
OUString("Symbol"), OUString("AppleSymbol") );
}
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 63c71a0..f444047 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -232,7 +232,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String& rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const
ImplDevFontAttributes& rDFA )
{
DBG_ASSERT( rFontFileName.Len() && rDFA.GetFamilyName().Len(),
"ImplFontNameCache::AddFontName - invalid data!" );
- if ( rFontFileName.Len() && rDFA.GetFamilyName().Len() )
+ if ( rFontFileName.Len() && rDFA.GetFamilyName().getLength() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
bModified = TRUE;
@@ -875,16 +875,16 @@ static ImplDevFontAttributes WinFont2DevFontAttributes(
const ENUMLOGFONTEXA& rE
// #i38665# prefer Type1 versions of the standard postscript fonts
if( aDFA.mbEmbeddable )
{
- if( aDFA.GetFamilyName().EqualsAscii( "AvantGarde" )
- || aDFA.GetFamilyName().EqualsAscii( "Bookman" )
- || aDFA.GetFamilyName().EqualsAscii( "Courier" )
- || aDFA.GetFamilyName().EqualsAscii( "Helvetica" )
- || aDFA.GetFamilyName().EqualsAscii( "NewCenturySchlbk" )
- || aDFA.GetFamilyName().EqualsAscii( "Palatino" )
- || aDFA.GetFamilyName().EqualsAscii( "Symbol" )
- || aDFA.GetFamilyName().EqualsAscii( "Times" )
- || aDFA.GetFamilyName().EqualsAscii( "ZapfChancery" )
- || aDFA.GetFamilyName().EqualsAscii( "ZapfDingbats" ) )
+ if( aDFA.GetFamilyName() == "AvantGarde"
+ || aDFA.GetFamilyName() == "Bookman"
+ || aDFA.GetFamilyName() == "Courier"
+ || aDFA.GetFamilyName() == "Helvetica"
+ || aDFA.GetFamilyName() == "NewCenturySchlbk"
+ || aDFA.GetFamilyName() == "Palatino"
+ || aDFA.GetFamilyName() == "Symbol"
+ || aDFA.GetFamilyName() == "Times"
+ || aDFA.GetFamilyName() == "ZapfChancery"
+ || aDFA.GetFamilyName() == "ZapfDingbats" )
aDFA.mnQuality += 500;
}
@@ -950,16 +950,16 @@ static ImplDevFontAttributes WinFont2DevFontAttributes(
const ENUMLOGFONTEXW& rE
// #i38665# prefer Type1 versions of the standard postscript fonts
if( aDFA.mbEmbeddable )
{
- if( aDFA.GetFamilyName().EqualsAscii( "AvantGarde" )
- || aDFA.GetFamilyName().EqualsAscii( "Bookman" )
- || aDFA.GetFamilyName().EqualsAscii( "Courier" )
- || aDFA.GetFamilyName().EqualsAscii( "Helvetica" )
- || aDFA.GetFamilyName().EqualsAscii( "NewCenturySchlbk" )
- || aDFA.GetFamilyName().EqualsAscii( "Palatino" )
- || aDFA.GetFamilyName().EqualsAscii( "Symbol" )
- || aDFA.GetFamilyName().EqualsAscii( "Times" )
- || aDFA.GetFamilyName().EqualsAscii( "ZapfChancery" )
- || aDFA.GetFamilyName().EqualsAscii( "ZapfDingbats" ) )
+ if( aDFA.GetFamilyName() == "AvantGarde"
+ || aDFA.GetFamilyName() == "Bookman"
+ || aDFA.GetFamilyName() == "Courier"
+ || aDFA.GetFamilyName() == "Helvetica"
+ || aDFA.GetFamilyName() == "NewCenturySchlbk"
+ || aDFA.GetFamilyName() == "Palatino"
+ || aDFA.GetFamilyName() == "Symbol"
+ || aDFA.GetFamilyName() == "Times"
+ || aDFA.GetFamilyName() == "ZapfChancery"
+ || aDFA.GetFamilyName() == "ZapfDingbats" )
aDFA.mnQuality += 500;
}
@@ -1465,7 +1465,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
if ( pFont->mpFontData )
aName = pFont->mpFontData->GetFamilyName();
else
- aName = pFont->GetFamilyName().GetToken( 0 );
+ aName = pFont->GetFamilyName().getToken( 0, ';' );
UINT nNameLen = aName.getLength();
if ( nNameLen > (sizeof( rLogFont.lfFaceName )/sizeof( wchar_t ))-1 )
@@ -2143,14 +2143,14 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList*
pFontList,
aDFA = mpFontAttrCache->GetFontAttr( rFontFileURL );
// Retrieve font name from font resource
- if( !aDFA.GetFamilyName().Len() )
+ if( aDFA.GetFamilyName().isEmpty() )
{
ImplGetFontAttrFromFile( rFontFileURL, aDFA );
- if( mpFontAttrCache && aDFA.GetFamilyName().Len() )
+ if( mpFontAttrCache && !aDFA.GetFamilyName().isEmpty() )
mpFontAttrCache->AddFontAttr( rFontFileURL, aDFA );
}
- if ( !aDFA.GetFamilyName().Len() )
+ if ( aDFA.GetFamilyName().isEmpty() )
return false;
// remember temp font for cleanup later
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
