summaryrefslogtreecommitdiff
path: root/vcl/qt5
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2017-12-14 18:42:57 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2017-12-15 11:13:22 +0100
commit8b700794b2746070814e9ff416ecd7bbb1c902e7 (patch)
tree33f7d4601405d518ebd476b69122d092c01d8219 /vcl/qt5
parent2ba36f21bad74cbbd68611afddaf9bbdc8ffda50 (diff)
Protect all LogicalFontInstance constructors
This way LogicalFontInstance can just be constructed by a PhysicalFontFace based factory. The patch also drops the wrong "Java logical font" comment added by commit 125cdf3404e60cf78f2a5547e9a06ce994df5c8e. Change-Id: Ibd5d7da0c3a65dbfa2c8ae6b05cf616d39b749f2 Reviewed-on: https://gerrit.libreoffice.org/46475 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/qt5')
-rw-r--r--vcl/qt5/Qt5FontFace.cxx5
-rw-r--r--vcl/qt5/Qt5FontFace.hxx1
2 files changed, 1 insertions, 5 deletions
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index 6d7074bbbb51..a73e4528ec05 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -110,7 +110,4 @@ bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities)
PhysicalFontFace* Qt5FontFace::Clone() const { return new Qt5FontFace(*this); }
-LogicalFontInstance* Qt5FontFace::CreateFontInstance(const FontSelectPattern& rFSD) const
-{
- return new LogicalFontInstance(rFSD);
-}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5FontFace.hxx b/vcl/qt5/Qt5FontFace.hxx
index 259b95939556..bd33893609d8 100644
--- a/vcl/qt5/Qt5FontFace.hxx
+++ b/vcl/qt5/Qt5FontFace.hxx
@@ -39,7 +39,6 @@ public:
static Qt5FontFace* fromQFont(const QFont& rFont);
PhysicalFontFace* Clone() const override;
- LogicalFontInstance* CreateFontInstance(const FontSelectPattern&) const override;
sal_IntPtr GetFontId() const override;
int GetFontTable(const char pTagName[5], unsigned char*) const;