broken win build

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

ASCOfficePPTXFile/Editor/FontPicker.cpp

 
 #include "BinWriters.h"
 
+/*
 HRESULT COfficeFontPicker::GetBinaryData(LONG lType, SAFEARRAY** ppBinaryArray)
 {
 	if (NULL == ppBinaryArray)
@@ -24,4 +25,29 @@ HRESULT COfficeFontPicker::GetBinaryData(LONG lType, SAFEARRAY** ppBinaryArray)
 	{
 	}
 	return S_OK;
+}
+*/
+HRESULT COfficeFontPicker::GetBinaryData(LONG lType, BYTE** ppyArray, size_t& szCount)
+{
+	if (NULL == ppyArray)
+		return S_FALSE;
+
+	*ppyArray = NULL;
+	if (FONT_PICKER_BINARYDATA_SAVEEMBEDDED == lType)
+	{
+		NSBinPptxRW::CBinaryFileWriter oWriter;
+		m_oPicker.m_oEmbeddedFonts.CheckString(_T(".)abcdefghijklmnopqrstuvwxyz"));
+		m_oPicker.m_oEmbeddedFonts.CheckFont(_T("Wingdings 3"), m_oPicker.m_pFontManager);
+		m_oPicker.m_oEmbeddedFonts.CheckFont(_T("Arial"), m_oPicker.m_pFontManager);
+
+		oWriter.StartRecord(NSBinPptxRW::NSMainTables::FontsEmbedded);
+		m_oPicker.m_oEmbeddedFonts.WriteEmbeddedFonts(&oWriter);
+		oWriter.EndRecord();
+
+		oWriter.GetSafearray(ppyArray, szCount);
+	}
+	else if (FONT_PICKER_BINARYDATA_SAVEMAP == lType)
+	{
+	}
+	return S_OK;
 }
\ No newline at end of file

ASCOfficePPTXFile/Editor/FontPicker.h

@@ -155,7 +155,9 @@ public:
 		return S_OK;
 	}
 
-	HRESULT GetBinaryData(LONG lType, SAFEARRAY** ppBinaryArray);
+	//HRESULT GetBinaryData(LONG lType, SAFEARRAY** ppBinaryArray);
+	HRESULT GetBinaryData(LONG lType, BYTE** ppyArray, size_t& szCount);
+
 	NSFontCutter::CFontDstManager* GetNativePicker()
 	{
 		return &m_oPicker;