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/svx/charmap.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/svx/charmap.hxx')
| -rw-r--r-- | include/svx/charmap.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index ed48d5da24cf..073f4f10e6ae 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -45,7 +45,7 @@ public: SvxShowCharSet( Window* pParent ); virtual ~SvxShowCharSet(); - void SetFont( const Font& rFont ); + void SetFont( const vcl::Font& rFont ); void SelectCharacter( sal_uInt32 cNew, bool bFocus = false ); sal_UCS4 GetSelectCharacter() const; |