diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /vcl/inc/outdev.h | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'vcl/inc/outdev.h')
| -rw-r--r-- | vcl/inc/outdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index dcde57c09ee9..c878d8b2590d 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -30,7 +30,7 @@ #include "PhysicalFontFace.hxx" class Size; -class Font; +namespace vcl { class Font; } class VirtualDevice; class ImplGetDevFontList; class GetDevSizeList; @@ -148,7 +148,7 @@ public: ~ImplFontCache(); ImplFontEntry* GetFontEntry( PhysicalFontCollection*, - const Font&, const Size& rPixelSize, float fExactHeight); + const vcl::Font&, const Size& rPixelSize, float fExactHeight); ImplFontEntry* GetFontEntry( PhysicalFontCollection*, FontSelectPattern& ); ImplFontEntry* GetGlyphFallbackFont( PhysicalFontCollection*, FontSelectPattern&, int nFallbackLevel, OUString& rMissingCodes ); |