diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-10 14:01:22 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-10 10:17:46 +0000 |
| commit | 36ccb37eee589c444445ab2d05a5c0dff6585a2f (patch) | |
| tree | f96ffe8380d2c052b3906352646d868e01303221 /vcl/generic | |
| parent | 5511b477fd5dc9b74ff05ea68b1b57b463b6fa51 (diff) | |
vcl: promote ImplFontAttributes to FontAttributes
ImplFontAttributes is no longer merely a pImpl (or "compilation
firewall", take your pick) but is a fully fledged class in its
own right that is used by a number of classes, including
FontSelectPattern, LogicalFontInstance and PhysicalFontFace. Thus
I'm "promoting" the use of this class in the codebase.
Change-Id: I26866080a64796978d1c25efbcd16e3e6f94aaa5
Reviewed-on: https://gerrit.libreoffice.org/21305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 12788c0c2011..4d13c52a1f9f 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -147,7 +147,7 @@ GlyphCache& GlyphCache::GetInstance() } void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, - sal_IntPtr nFontId, const ImplFontAttributes& rDFA) + sal_IntPtr nFontId, const FontAttributes& rDFA) { if( mpFtManager ) mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 420437ebdb11..6ce0811ca28f 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -878,7 +878,7 @@ bool GenPspGraphics::AddTempDevFontHelper( PhysicalFontCollection* pFontCollecti aInfo.m_aFamilyName = rFontName; // inform glyph cache of new font - ImplFontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo ); + FontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo ); aDFA.IncreaseQualityBy( 5800 ); int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID ); @@ -913,14 +913,14 @@ void GenPspGraphics::ClearDevFontCache() GlyphCache::GetInstance().ClearFontCache(); } -void GenPspGraphics::GetFontAttributes( ImplFontAttributes *pFontAttributes, int ) +void GenPspGraphics::GetFontAttributes( FontAttributes *pFontAttributes, int ) { const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); psp::PrintFontInfo aInfo; if (rMgr.getFontInfo (m_pPrinterGfx->GetFontID(), aInfo)) { - ImplFontAttributes aDFA = Info2FontAttributes( aInfo ); + FontAttributes aDFA = Info2FontAttributes( aInfo ); *pFontAttributes = aDFA; pFontAttributes->SetBuiltInFontFlag( aDFA.IsBuiltInFont() ); pFontAttributes->SetScalableFlag( true ); @@ -1083,9 +1083,9 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont, rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc ); } -ImplFontAttributes GenPspGraphics::Info2FontAttributes( const psp::FastPrintFontInfo& rInfo ) +FontAttributes GenPspGraphics::Info2FontAttributes( const psp::FastPrintFontInfo& rInfo ) { - ImplFontAttributes aDFA; + FontAttributes aDFA; aDFA.SetFamilyName( rInfo.m_aFamilyName ); aDFA.SetStyleName( rInfo.m_aStyleName ); aDFA.SetFamilyType( rInfo.m_eFamilyStyle ); |