[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Julien Nabet]

 vcl/inc/unx/printergfx.hxx           |    2 +-
 vcl/unx/generic/print/glyphset.cxx   |    2 +-
 vcl/unx/generic/print/glyphset.hxx   |    6 +++---
 vcl/unx/generic/print/printerjob.cxx |    4 ++--
 vcl/unx/generic/print/text_gfx.cxx   |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fedb29b305a73dc471ce7035406b5dc489011972
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Nov 1 08:03:21 2017 +0100

    Replace some lists by vectors in generic/print (vcl)
    
    Change-Id: I1fdbdbb62a30a3bd81b7e24bf15c8ccb64a2ef44
    Reviewed-on: https://gerrit.libreoffice.org/44151
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 22042bab2b05..e9603b51f2be 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -252,7 +252,7 @@ public:
     void            PSShowGlyph (const unsigned char nGlyphId);
 
     void            OnEndJob ();
-    void            writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts );
+    void            writeResources( osl::File* pFile, std::vector< OString >& rSuppliedFonts );
     PrintFontManager& GetFontMgr () { return mrFontMgr; }
 
     void            drawGlyph(const Point& rPoint,
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index a29d331d53ed..1d60d7510145 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -246,7 +246,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
 }
 
 void
-GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42, std::list< OString >& rSuppliedFonts )
+GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42, std::vector< OString >& rSuppliedFonts )
 {
     TrueTypeFont *pTTFont;
     OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID));
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 8122d5838a35..45d0c81d6474 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -26,7 +26,7 @@
 
 #include <rtl/string.hxx>
 
-#include <list>
+#include <vector>
 #include <unordered_map>
 
 class Point;
@@ -45,7 +45,7 @@ private:
     OString             maBaseName;
 
     typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
-    typedef std::list< glyph_map_t > glyph_list_t;
+    typedef std::vector< glyph_map_t > glyph_list_t;
 
     glyph_list_t        maGlyphList;
 
@@ -76,7 +76,7 @@ public:
                                const Point& rPoint,
                                const sal_GlyphId nGlyphId,
                                const sal_Int32 nDelta);
-    void        PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
+    void        PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::vector< OString >& rSuppliedFonts );
 };
 
 } /* namespace psp */
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index a086d253f5db..d1eac841c92c 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -950,12 +950,12 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
     WritePS (pFile, "%%BeginSetup\n%\n");
 
     // download fonts
-    std::list< OString > aFonts;
+    std::vector< OString > aFonts;
     m_pGraphics->writeResources( pFile, aFonts );
 
     if( !aFonts.empty() )
     {
-        std::list< OString >::const_iterator it = aFonts.begin();
+        std::vector< OString >::const_iterator it = aFonts.begin();
         OStringBuffer aLine( 256 );
         aLine.append( "%%DocumentSuppliedResources: font " );
         aLine.append( *it );
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 0d9411eb6b9f..ef71ac409e2b 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -155,7 +155,7 @@ PrinterGfx::OnEndJob ()
 }
 
 void
-PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts )
+PrinterGfx::writeResources( osl::File* pFile, std::vector< OString >& rSuppliedFonts )
 {
     // write glyphsets and reencodings
     for (auto & PS3Font : maPS3Font)