From c78aed4b4b554edffe482b03ddbbffcbff2d44a4 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Wed, 15 Oct 2014 07:33:35 +0000 Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=B4=D0=BE=D0=B3=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58872 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficePPTXFile/Editor/FontCutter.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ASCOfficePPTXFile/Editor/FontCutter.h b/ASCOfficePPTXFile/Editor/FontCutter.h index 6e89ec7f01..a32fb21a8f 100644 --- a/ASCOfficePPTXFile/Editor/FontCutter.h +++ b/ASCOfficePPTXFile/Editor/FontCutter.h @@ -158,10 +158,10 @@ namespace NSFontCutter { #ifdef BUILD_CONFIG_FULL_VERSION ULONG nCount = 0; - POSITION pos = m_mapFontsEmbeddded.GetStartPosition(); - while (pos != NULL) + + for(std::map::iterator pPair = m_mapFontsEmbeddded.begin(); pPair != m_mapFontsEmbeddded.end(); ++pPair) { - CEmbeddedFontInfo& oInfo = m_mapFontsEmbeddded.GetNextValue(pos); + CEmbeddedFontInfo& oInfo = pPair->second; if (_T("") != oInfo.PathRegular) ++nCount; @@ -193,10 +193,9 @@ namespace NSFontCutter Fonts::IFontConverter* pFontConverter = NULL; CoCreateInstance(__uuidof(Fonts::CFontConverter), NULL, CLSCTX_ALL, __uuidof(Fonts::IFontConverter), (void**)&pFontConverter); - pos = m_mapFontsEmbeddded.GetStartPosition(); - while (pos != NULL) + for(std::map::iterator pPair = m_mapFontsEmbeddded.begin(); pPair != m_mapFontsEmbeddded.end(); ++pPair) { - CEmbeddedFontInfo& oInfo = m_mapFontsEmbeddded.GetNextValue(pos); + CEmbeddedFontInfo& oInfo = pPair->second; if (_T("") != oInfo.PathRegular) {