summaryrefslogtreecommitdiff
path: root/include/svtools/ivctrl.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-16 10:09:58 +0200
committerNoel Grandin <noel@peralex.com>2014-09-18 08:54:37 +0200
commit60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch)
tree17ff5aaa57f4d23e177f1fe423def1691139a4a8 /include/svtools/ivctrl.hxx
parent9c818268767d6a1c1bc731ae30c45883bab987e7 (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/ivctrl.hxx')
-rw-r--r--include/svtools/ivctrl.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 1b4cba84747b..f93200899de3 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -269,8 +269,8 @@ public:
bool SetChoiceWithCursor ( bool bDo = true );
- void SetFont( const Font& rFont );
- void SetPointFont( const Font& rFont );
+ void SetFont( const vcl::Font& rFont );
+ void SetPointFont( const vcl::Font& rFont );
void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; }
const Link& GetClickHdl() const { return _aClickIconHdl; }