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 /sd/source/ui/annotations/annotationmanagerimpl.hxx | |
| parent | Use svxcorelo-SvxColorValueSet instead (diff) | |
| download | core-60e78fbb806bb45e635ba1de45ceffe187938ac0.tar.gz core-60e78fbb806bb45e635ba1de45ceffe187938ac0.zip | |
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 'sd/source/ui/annotations/annotationmanagerimpl.hxx')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 36b40e40870c..f81c76112fcd 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -124,7 +124,7 @@ private: bool mbShowAnnotations; ImplSVEvent * mnUpdateTagsEvent; - Font maFont; + vcl::Font maFont; }; OUString getAnnotationDateTimeString( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); |