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/source | |
| 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/source')
| -rw-r--r-- | vcl/source/font/PhysicalFontFace.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/font/PhysicalFontFamily.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index d356438e43a1..1b0940c8fb76 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -37,14 +37,6 @@ PhysicalFontFace::PhysicalFontFace( const FontAttributes& rDFA ) SetSymbolFlag( true ); } -PhysicalFontFace::PhysicalFontFace( const PhysicalFontFace& other ) - : FontAttributes( other ) - , salhelper::SimpleReferenceObject() - , mnWidth(other.mnWidth) - , mnHeight(other.mnWidth) -{ -} - rtl::Reference<LogicalFontInstance> PhysicalFontFace::CreateFontInstance(const FontSelectPattern& rFSD) const { return new LogicalFontInstance(*this, rFSD); diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index d0c1c2dad165..6953d259798f 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -264,15 +264,7 @@ void PhysicalFontFamily::UpdateCloneFontList(PhysicalFontCollection& rFontCollec pFamily = rFontCollection.FindOrCreateFontFamily(aFamilyName); } assert(pFamily); - rtl::Reference<PhysicalFontFace> pClonedFace = pFoundFontFace->Clone(); - -#if OSL_DEBUG_LEVEL > 0 - OUString aClonedFamilyName = GetEnglishSearchFontName( pClonedFace->GetFamilyName() ); - assert( aClonedFamilyName == aFamilyName ); - assert( rFontCollection.FindOrCreateFontFamily( aClonedFamilyName ) == pFamily ); -#endif - - pFamily->AddFontFace( pClonedFace.get() ); + pFamily->AddFontFace( pFoundFontFace ); } } diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index e17ca2a5f73a..e663ef6ab875 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1290,7 +1290,6 @@ public: explicit PdfBuiltinFontFace( const PDFWriterImpl::BuiltinFont& ); const PDFWriterImpl::BuiltinFont& GetBuiltinFont() const { return mrBuiltin; } - virtual rtl::Reference<PhysicalFontFace> Clone() const override { return new PdfBuiltinFontFace(*this); } virtual sal_IntPtr GetFontId() const override { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); } }; |