Kaydet (Commit) fedb29b3 authored tarafından Julien Nabet's avatar Julien Nabet

Replace some lists by vectors in generic/print (vcl)

Change-Id: I1fdbdbb62a30a3bd81b7e24bf15c8ccb64a2ef44
Reviewed-on: https://gerrit.libreoffice.org/44151Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Tested-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 508797b6
...@@ -252,7 +252,7 @@ public: ...@@ -252,7 +252,7 @@ public:
void PSShowGlyph (const unsigned char nGlyphId); void PSShowGlyph (const unsigned char nGlyphId);
void OnEndJob (); void OnEndJob ();
void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts ); void writeResources( osl::File* pFile, std::vector< OString >& rSuppliedFonts );
PrintFontManager& GetFontMgr () { return mrFontMgr; } PrintFontManager& GetFontMgr () { return mrFontMgr; }
void drawGlyph(const Point& rPoint, void drawGlyph(const Point& rPoint,
......
...@@ -246,7 +246,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, ...@@ -246,7 +246,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
} }
void 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; TrueTypeFont *pTTFont;
OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID)); OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID));
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <list> #include <vector>
#include <unordered_map> #include <unordered_map>
class Point; class Point;
...@@ -45,7 +45,7 @@ private: ...@@ -45,7 +45,7 @@ private:
OString maBaseName; OString maBaseName;
typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; 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; glyph_list_t maGlyphList;
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
const Point& rPoint, const Point& rPoint,
const sal_GlyphId nGlyphId, const sal_GlyphId nGlyphId,
const sal_Int32 nDelta); 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 */ } /* namespace psp */
......
...@@ -950,12 +950,12 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob ) ...@@ -950,12 +950,12 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
WritePS (pFile, "%%BeginSetup\n%\n"); WritePS (pFile, "%%BeginSetup\n%\n");
// download fonts // download fonts
std::list< OString > aFonts; std::vector< OString > aFonts;
m_pGraphics->writeResources( pFile, aFonts ); m_pGraphics->writeResources( pFile, aFonts );
if( !aFonts.empty() ) if( !aFonts.empty() )
{ {
std::list< OString >::const_iterator it = aFonts.begin(); std::vector< OString >::const_iterator it = aFonts.begin();
OStringBuffer aLine( 256 ); OStringBuffer aLine( 256 );
aLine.append( "%%DocumentSuppliedResources: font " ); aLine.append( "%%DocumentSuppliedResources: font " );
aLine.append( *it ); aLine.append( *it );
......
...@@ -155,7 +155,7 @@ PrinterGfx::OnEndJob () ...@@ -155,7 +155,7 @@ PrinterGfx::OnEndJob ()
} }
void void
PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts ) PrinterGfx::writeResources( osl::File* pFile, std::vector< OString >& rSuppliedFonts )
{ {
// write glyphsets and reencodings // write glyphsets and reencodings
for (auto & PS3Font : maPS3Font) for (auto & PS3Font : maPS3Font)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment