падение при открытии pptx с wmf.

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

ASCHTMLRenderer/CASCImage.cpp

@@ -11,9 +11,9 @@
 
 namespace NSHtmlRenderer
 {
-	CASCImage::CASCImage()
+    CASCImage::CASCImage(CApplicationFonts *pAppFonts)
 	{
-		m_pMetafile		= new MetaFile::CMetaFile(NULL);
+        m_pMetafile		= new MetaFile::CMetaFile(pAppFonts);
 		m_pMediaData	= NULL;
 
         m_bLoadOnlyMeta = false;
@@ -226,13 +226,6 @@ namespace NSHtmlRenderer
 	{
 		return m_pMetafile->get_FontManager();
 	}
-	void CASCImage::put_FontManager(CFontManager* pManager)
-	{
-		if (pManager == NULL) return;
-
-		RELEASEOBJECT(m_pMetafile);
-		m_pMetafile = new MetaFile::CMetaFile(pManager->m_pApplication);
-	}
 
 	Aggplus::CImage* CASCImage::get_BitmapImage()
 	{

ASCHTMLRenderer/CASCImage.h

@@ -28,6 +28,7 @@ namespace MetaFile
 };
 
 class CFontManager;
+class CApplicationFonts;
 
 namespace Aggplus
 {
@@ -79,7 +80,7 @@ namespace NSHtmlRenderer
 
 	public:
 
-		CASCImage();
+		CASCImage(CApplicationFonts *pAppFonts);
 		~CASCImage();
 
 	private:

ASCHTMLRenderer/CMetafile.cpp

@@ -143,10 +143,9 @@ namespace NSHtmlRenderer
 			pRenderer->get_PenAlpha( &oPen.Alpha );
 			pRenderer->get_PenColor( &oPen.Color );
 
-
-			NSHtmlRenderer::CASCImage oImage;
             //todo font manager
-			oImage.put_FontManager(NULL);
+            CApplicationFonts *pAppFonts = NULL;
+            NSHtmlRenderer::CASCImage oImage(pAppFonts);
 
 			oImage.LoadFromFile( strFile );
 			oImage.DrawOnRenderer( pRenderer, dX, dY, dW, dH );

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -325,6 +325,7 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(BSTR bsInput, BSTR bsOutput)
 	oBinaryWriter.m_strMainFolder = pathDstFileOutput.GetDirectory();
 
  	oBinaryWriter.m_pCommon->m_pImageManager->m_strDstMedia = m_strMediaDirectory;
+	oBinaryWriter.m_pCommon->m_pImageManager->SetFontManager(oBinaryWriter.m_pCommon->m_pNativePicker->m_pFontManager);
 
     FileSystem::Directory::CreateDirectory(m_strMediaDirectory);
 

ASCOfficePPTXFile/Editor/WMFToImageConverter.h

@@ -149,8 +149,8 @@ namespace NSWMFToImageConverter
 			pRenderer->get_PenAlpha( &pen_Alpha );
 			pRenderer->get_PenColor( &pen_Color );
 
-			NSHtmlRenderer::CASCImage oASCImage;
-			oASCImage.put_FontManager(m_pFontManager);
+			CApplicationFonts *pAppFonts = (NULL != m_pFontManager) ? m_pFontManager->m_pApplication : NULL;
+			NSHtmlRenderer::CASCImage oASCImage(pAppFonts);
 
 			oASCImage.LoadFromFile( strFile );
 

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -561,8 +561,8 @@ namespace NSShapeImageGen
 					}
 					if (bIsSuccess == false)
 					{
-						NSHtmlRenderer::CASCImage oImage;
-						oImage.put_FontManager(m_pFontManager);
+						CApplicationFonts *pAppFonts = (NULL != m_pFontManager) ? m_pFontManager->m_pApplication : NULL;
+						NSHtmlRenderer::CASCImage oImage(pAppFonts);
 
 						oImage.LoadFromFile(std::wstring(strFileName.GetString()));