summaryrefslogtreecommitdiff
path: root/sdext/source
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 /sdext/source
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 'sdext/source')
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index eedffe48ba03..0462c286bc71 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -664,7 +664,7 @@ void Parser::readFont()
if (vDev == 0)
vDev = new VirtualDevice;
- Font font(aResult.familyName, Size(0, 1000));
+ vcl::Font font(aResult.familyName, Size(0, 1000));
vDev->SetFont(font);
FontMetric metric(vDev->GetFontMetric());
aResult.ascent = metric.GetAscent() / 1000.0;