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 /include/vcl/fixed.hxx | |
| 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 'include/vcl/fixed.hxx')
| -rw-r--r-- | include/vcl/fixed.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index e215e9911d6d..f875f19b7afc 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -51,7 +51,7 @@ public: SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); protected: virtual void FillLayoutData() const SAL_OVERRIDE; - virtual const Font& + virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: protected: virtual void FillLayoutData() const SAL_OVERRIDE; - virtual const Font& + virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; |