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/source/gdi | |
| 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/source/gdi')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/virdev.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index d6b561efb0cf..6e9f45f3d8cd 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -608,7 +608,7 @@ void Font::Merge( const vcl::Font& rFont ) SetRelief( rFont.GetRelief() ); } -void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const +void Font::GetFontAttributes( FontAttributes& rAttrs ) const { rAttrs.SetFamilyName( mpImplFont->maFamilyName ); rAttrs.SetStyleName( mpImplFont->maStyleName ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 9930d9777b76..f9d3fbd755f5 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2240,9 +2240,9 @@ OutputDevice* PDFWriterImpl::getReferenceDevice() return m_pReferenceDevice; } -static ImplFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) +static FontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { - ImplFontAttributes aDFA; + FontAttributes aDFA; aDFA.SetFamilyName( OUString::createFromAscii( rBuiltin.m_pName ) ); aDFA.SetStyleName( OUString::createFromAscii( rBuiltin.m_pStyleName ) ); aDFA.SetFamilyType( rBuiltin.m_eFamily ); diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 1210759c5f14..1a30f2f0f4c9 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -47,7 +47,7 @@ class StyleSettings; class FontSelectPattern; -class ImplFontAttributes; +class FontAttributes; class FontSubsetInfo; class ZCodec; class EncHashTransporter; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index abd8a2ed4e0a..e3e129e78d21 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -564,7 +564,7 @@ long VirtualDevice::GetFontExtLeading() const #endif LogicalFontInstance* pFontInstance = mpFontInstance; - ImplFontAttributes* pFontAttributes = &(pFontInstance->maFontAttributes); + FontAttributes* pFontAttributes = &(pFontInstance->maFontAttributes); return pFontAttributes->GetExternalLeading(); } |