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/svtools/hyperlabel.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/svtools/hyperlabel.hxx')
-rw-r--r-- | include/svtools/hyperlabel.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index ff68064673dd..aa38892b60ab 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -45,8 +45,8 @@ namespace svt virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - void DeactivateHyperMode(Font aFont, const Color aColor); - void ActivateHyperMode(Font aFont, const Color aColor); + void DeactivateHyperMode(vcl::Font aFont, const Color aColor); + void ActivateHyperMode(vcl::Font aFont, const Color aColor); protected: void implInit(); |