Bug 27248 - Docx\Doc ошибка при открытии документа с wmf.

FontManager::LoadString1

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59304 954022d7-b5bf-4e40-9824-e11837661b57

ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/RendererOutput.h

@@ -704,7 +704,7 @@ public:
 			long lStyle = ( pFont->ushWeight > 550 ? 1 : 0 ) + ( pFont->unItalic ? 2 : 0 );
 #ifdef DESKTOP_EDITOR_GRAPHICS
 			m_pWmfFile->m_pFontManager->LoadFontByName( ascii_to_unicode(pText->pDC->pFont->sFaceName), dSize, lStyle, 72, 72 );
-            m_pWmfFile->m_pFontManager->LoadString2( ascii_to_unicode(pText->sText), 0, 0 );
+            m_pWmfFile->m_pFontManager->LoadString1( ascii_to_unicode(pText->sText), 0, 0 );
 			TBBox oBox = m_pWmfFile->m_pFontManager->MeasureString2();
 			fL = oBox.fMinX;
 			fT = oBox.fMinY;

ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/WmfFile.h

@@ -3496,7 +3496,7 @@ private:
 			float fTempX, fTempY, fTempW, fTempH;
 #ifdef DESKTOP_EDITOR_GRAPHICS
 			m_pFontManager->LoadFontByName( ascii_to_unicode(pPlayer->pDC->pFont->sFaceName), (float)(oDrawText.dFontHeight * 72 / 25.4), lStyle, 72.0f, 72.0f );
-			m_pFontManager->LoadString2( ascii_to_unicode(oDrawText.sText), 0, 0 );
+			m_pFontManager->LoadString1( ascii_to_unicode(oDrawText.sText), 0, 0 );
 
 			TBBox oBox = m_pFontManager->MeasureString2();
 			fTempX = oBox.fMinX;