diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-07 15:57:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-11 08:51:23 +0200 |
commit | a901e48579e203a28cc0871ceed0356ae6a5798b (patch) | |
tree | 6186461f1e95c929a404db49b90da92c53746242 /vcl/inc | |
parent | a49440b1c4a7cd831212e2e3c19f89ce12a4e889 (diff) |
drop PhysicalFontFace::Clone
since we are now holding these via reference counting, no need to clone
them
Change-Id: I7b0bd86f4a5bca428f7dcd989f838a9aa0c7e179
Reviewed-on: https://gerrit.libreoffice.org/55427
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/PhysicalFontFace.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/qt5/Qt5FontFace.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/inc/unx/freetype_glyphcache.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 1 |
5 files changed, 0 insertions, 9 deletions
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index e289345716ca..c350a6c81649 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -55,7 +55,6 @@ class VCL_PLUGIN_PUBLIC PhysicalFontFace : public FontAttributes, public salhelp { public: virtual rtl::Reference<LogicalFontInstance> CreateFontInstance(const FontSelectPattern&) const; - virtual rtl::Reference<PhysicalFontFace> Clone() const = 0; int GetHeight() const { return mnHeight; } int GetWidth() const { return mnWidth; } @@ -67,7 +66,6 @@ public: protected: explicit PhysicalFontFace(const FontAttributes&); - PhysicalFontFace(const PhysicalFontFace&); void SetBitmapSize( int nW, int nH ) { mnWidth=nW; mnHeight=nH; } long mnWidth; // Width (in pixels) diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx index 0e1a359acbb5..3c94f46777e1 100644 --- a/vcl/inc/qt5/Qt5FontFace.hxx +++ b/vcl/inc/qt5/Qt5FontFace.hxx @@ -38,7 +38,6 @@ public: static Qt5FontFace* fromQFont(const QFont& rFont); - rtl::Reference<PhysicalFontFace> Clone() const override; sal_IntPtr GetFontId() const override; int GetFontTable(const char pTagName[5], unsigned char*) const; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 1dd896058890..92b7b0349673 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -61,7 +61,6 @@ public: CoreTextFontFace( const FontAttributes&, sal_IntPtr nFontID ); virtual ~CoreTextFontFace() override; - rtl::Reference<PhysicalFontFace> Clone() const override; sal_IntPtr GetFontId() const override; int GetFontTable( uint32_t nTagCode, unsigned char* ) const; @@ -73,9 +72,6 @@ public: rtl::Reference<LogicalFontInstance> CreateFontInstance(const FontSelectPattern&) const override; -protected: - CoreTextFontFace( const CoreTextFontFace& ); - private: const sal_IntPtr mnFontId; mutable FontCharMapRef mxCharMap; diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index bf00935b15a1..910aa2a70ae6 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -115,7 +115,6 @@ public: FreetypeFontFace( FreetypeFontInfo*, const FontAttributes& ); virtual rtl::Reference<LogicalFontInstance> CreateFontInstance( const FontSelectPattern& ) const override; - virtual rtl::Reference<PhysicalFontFace> Clone() const override { return new FreetypeFontFace( *this ); } virtual sal_IntPtr GetFontId() const override { return mpFreetypeFontInfo->GetFontId(); } }; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 661c47908865..5f6dbe21836e 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -63,7 +63,6 @@ public: BYTE nPitchAndFamily ); virtual ~WinFontFace() override; - virtual rtl::Reference<PhysicalFontFace> Clone() const override; virtual rtl::Reference<LogicalFontInstance> CreateFontInstance( const FontSelectPattern& ) const override; virtual sal_IntPtr GetFontId() const override; void SetFontId( sal_IntPtr nId ) { mnId = nId; } |