[Libreoffice-commits] core.git: 2 commits - vcl/source
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 30 11:00:22 UTC 2019
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl.hxx | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 06d8d773f07fa7fba55f3ec5aa2715c9f857ab02
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 09:17:44 2019 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Dec 30 12:00:00 2019 +0100
pdf: remove FontMapping typedef
Change-Id: Idb4ea16bc9ebc238eaab7ff242468a39e241948e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85985
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 1e5490fa9f58..143460b457cf 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5694,7 +5694,7 @@ void PDFWriterImpl::registerGlyph(const GlyphItem* pGlyph,
const int nFontGlyphId = pGlyph->glyphId();
FontSubset& rSubset = m_aSubsets[ pFont ];
// search for font specific glyphID
- FontMapping::iterator it = rSubset.m_aMapping.find( nFontGlyphId );
+ auto it = rSubset.m_aMapping.find( nFontGlyphId );
if( it != rSubset.m_aMapping.end() )
{
nMappedFontObject = it->second.m_nFontID;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 2381b107c14e..7ccd43119151 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -300,11 +300,10 @@ public:
sal_Int32 m_nFontID;
sal_uInt8 m_nSubsetGlyphID;
};
- typedef std::map< sal_GlyphId, Glyph > FontMapping;
struct FontSubset
{
std::vector< FontEmit > m_aSubsets;
- FontMapping m_aMapping;
+ std::map<sal_GlyphId, Glyph> m_aMapping;
};
typedef std::map< const PhysicalFontFace*, FontSubset > FontSubsetData;
struct EmbedFont
commit e2da69a47f313126849d52d4581f87ff30dc398b
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 09:15:31 2019 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Dec 30 11:59:48 2019 +0100
pdf: remove FontEmitMapping typedef
Change-Id: I298750f9bce8ed04f6818d209e14db7e8932330a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85984
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Tested-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 0420567ef5ba..2381b107c14e 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -288,11 +288,10 @@ public:
return nRet;
}
};
- typedef std::map< sal_GlyphId, GlyphEmit > FontEmitMapping;
struct FontEmit
{
sal_Int32 m_nFontID;
- FontEmitMapping m_aMapping;
+ std::map<sal_GlyphId, GlyphEmit> m_aMapping;
explicit FontEmit( sal_Int32 nID ) : m_nFontID( nID ) {}
};
More information about the Libreoffice-commits
mailing list