vcl/inc/unx/printergfx.hxx | 2 +-
vcl/unx/generic/print/text_gfx.cxx | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 0c46b3a9a384d5b70a708c3e9459a790dd815c63
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Oct 21 09:54:04 2017 +0200
Replace list by vector for maPS3Font (vcl)
Change-Id: Ida0d1a87e32024430fd314c601b9acb9358a9dd2
Reviewed-on: https://gerrit.libreoffice.org/43641
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 33aaa797f8d9..6861322ba964 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -179,7 +179,7 @@ private:
glyph in one of the subfonts, the mapping from unicode to the
glyph has to be remembered */
- std::list< GlyphSet > maPS3Font;
+ std::vector< GlyphSet > maPS3Font;
sal_Int32 mnFontID;
sal_Int32 mnTextAngle;
diff --git a/vcl/unx/generic/print/text_gfx.cxx
b/vcl/unx/generic/print/text_gfx.cxx
index 24747ae119db..59b74614e0a1 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -66,7 +66,7 @@ void PrinterGfx::drawGlyph(const Point& rPoint,
// draw the string
// search for a glyph set matching the set font
- std::list< GlyphSet >::iterator aIter;
+ std::vector< GlyphSet >::iterator aIter;
for (aIter = maPS3Font.begin(); aIter != maPS3Font.end(); ++aIter)
if ( ((*aIter).GetFontID() == mnFontID)
&& ((*aIter).IsVertical() == mbTextVertical))
@@ -158,10 +158,9 @@ void
PrinterGfx::writeResources( osl::File* pFile, std::list< OString >&
rSuppliedFonts )
{
// write glyphsets and reencodings
- std::list< GlyphSet >::iterator aIter;
- for (aIter = maPS3Font.begin(); aIter != maPS3Font.end(); ++aIter)
+ for (auto & PS3Font : maPS3Font)
{
- aIter->PSUploadFont (*pFile, *this, mbUploadPS42Fonts, rSuppliedFonts
);
+ PS3Font.PSUploadFont (*pFile, *this, mbUploadPS42Fonts, rSuppliedFonts
);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
