summaryrefslogtreecommitdiff
path: root/vcl/inc/qt5
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-20 15:41:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-08-21 21:28:01 +0200
commit2f97ae5def2e51cfec3240fa625ffd495288360e (patch)
tree27d49dc19288c21254023bc784618de5a3e3a6bf /vcl/inc/qt5
parent3a6f510c3e3bc269b2816cd6cca57f81eb7c4ae3 (diff)
use LogicalFontInstance with SalGraphics
Change-Id: I66fb1ff4b2fdcc211e0a9d5831f6dcc5e564e789 Reviewed-on: https://gerrit.libreoffice.org/59372 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc/qt5')
-rw-r--r--vcl/inc/qt5/Qt5FontFace.hxx2
-rw-r--r--vcl/inc/qt5/Qt5Graphics.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index c653b4be6f6e..70522f67e0d6 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -28,7 +28,7 @@
#include <QtCore/QString>
class FontAttributes;
-class FontSelectPattern;
+class FontSelectPatternAttributes;
class QFont;
class Qt5FontFace : public PhysicalFontFace
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 88382a0c11f3..fa9823b0e789 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -172,7 +172,7 @@ public:
// Text rendering + font support
virtual void SetTextColor(Color nColor) override;
- virtual void SetFont(const FontSelectPattern*, int nFallbackLevel) override;
+ virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override;
virtual void GetFontMetric(ImplFontMetricDataRef&, int nFallbackLevel) override;
virtual const FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const override;