(1.0.0.37): ASCPresentationEditor

Интерфейс PptxFile перенесен в DocxFile2

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

ASCOfficeDocxFile2/ASCOfficeDocxFile2.cpp

@@ -4,6 +4,7 @@
 
 #include "DocxFile2.h"
 #include "XlsxFile2.h"
+#include "PptxFile.h"
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{A1EEE61A-FAA7-47af-B078-4E955623B9CA}", 

ASCOfficeDocxFile2/ASCOfficeDocxFile2.rc

@@ -143,6 +143,8 @@ IDB_DEFAULT_DOC_CORE				DOCXWR			"Resources\\core.xml"
 IDB_DEFAULT_DOC_THEME				DOCXWR			"Resources\\theme.xml"
 IDB_DEFAULT_DOC_WEBSETTINGS			DOCXWR			"Resources\\webSettings.xml"
 IDB_DEFAULT_XLSX_THEME				XLSXSER			"..\\XlsxSerializerCom\\Resource\\theme1.xml"
+IDB_XML_NOTESTHEME					PPTXW           "..\\ASCOfficePPTXFile\\Editor\\ResourceFiles\\notesTheme.xml"
+IDB_XML_NOTESMASTER					PPTXW           "..\\ASCOfficePPTXFile\\Editor\\ResourceFiles\\notesMaster.xml"
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj

@@ -726,6 +726,10 @@
 			RelativePath=".\DocxFile2.h"
 			>
 		</File>
+		<File
+			RelativePath=".\PptxFile.h"
+			>
+		</File>
 		<File
 			RelativePath=".\stdafx.h"
 			>

ASCOfficeDocxFile2/PptxFile.h

+// CAVSOfficePPTXFile.h : Declaration of the CAVSOfficePPTXFile
+
+#pragma once
+#include "stdafx.h"
+#include "resource.h"       // main symbols
+
+#include "../Common/OfficeFileTemplate.h"
+#include "../ASCOfficePPTXFile/ASCOfficePPTXFile.h"
+
+#include "../Common/DocxFormat/Source/SystemUtility/File.h"
+
+void comLoadTheme(void* pArg, int nIndex, CString& strDstFolder);
+bool comExtractFile(void* pArg, CString& sFile, CString& sDir);
+bool comCompressFile(void* pArg, CString& sDir, CString& sFile);
+bool comProgress(void* pArg, long ID, long Percent);
+
+// IAVSOfficePPTXFile
+[object, uuid("096DBAB4-3E54-4e14-99F4-B57D97081C61"), dual, pointer_default(unique)]
+__interface IAVSOfficePPTXFile : IAVSOfficeFileTemplate
+{
+//	[id(3), helpstring("method SaveAsDrawingXML")] HRESULT SaveAsDrawingXML([in] BSTR sSrcFileName, [in] BSTR sDestPath, [in] BSTR sDestXMLFileName);
+
+	[propget, id(4), helpstring("property TempDirectory")] HRESULT TempDirectory([out, retval] BSTR* pVal);
+	[propput, id(4), helpstring("property TempDirectory")] HRESULT TempDirectory([in] BSTR newVal);
+	[id(5), helpstring("method GetDVDXml")] HRESULT GetDVDXml([out,retval] BSTR* pbstrPTTXml);
+	[id(6), helpstring("method GetBluRayXml")] HRESULT GetBluRayXml([out,retval] BSTR* pbstrDVDXml);
+	[propget, id(7), helpstring("property DrawingXml")] HRESULT DrawingXml([out, retval] BSTR* pVal);
+
+	[id(2000 + 0)] HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
+	[id(2001 + 1)] HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
+};
+
+// IAVSOfficePPTXFile2
+[object, uuid("68603ED6-0BB4-4330-9A80-D06B855D6DAA"), dual, pointer_default(unique)]
+__interface IAVSOfficePPTXFile2 : IDispatch
+{
+	[id(10000 + 0)] HRESULT OpenFileToPPTY([in] BSTR bsInputDir, [in] BSTR bsFileDst);
+	[id(10000 + 1)] HRESULT OpenDirectoryToPPTY([in] BSTR bsInputDir, [in] BSTR bsFileDst);
+
+	[id(10000 + 2)] HRESULT SetMediaDir([in] BSTR bsMediaDir);
+	[id(10000 + 3)] HRESULT SetFontDir([in] BSTR bsFontDir);
+
+	[id(10000 + 4)] HRESULT SetUseSystemFonts([in] VARIANT_BOOL useSystemFonts);
+	[id(10000 + 5)] HRESULT ConvertPPTYToPPTX([in] BSTR bsInputFile, [in] BSTR bsFileDst);
+
+	[id(10000 + 6)] HRESULT SetThemesDir([in] BSTR bsThemesPath);
+};
+
+// CAVSOfficePPTXFile
+[coclass, uuid("A3B9F270-175E-4982-B302-55ED6DF6361E"), event_source(com), threading(apartment), vi_progid("AVSOfficePPTXFile.OfficePPTXFile"), progid("AVSOfficePPTXFile.OfficePPTXFile.1"), version(1.0), registration_script("control.rgs")]
+class ATL_NO_VTABLE CAVSOfficePPTXFile 
+	:	public IAVSOfficePPTXFile
+	,	public IAVSOfficePPTXFile2
+{
+private:
+	CPPTXFile m_oCPPTXFile;
+public:
+
+	__event __interface _IAVSOfficeFileTemplateEvents2;
+	CAVSOfficePPTXFile() : m_oCPPTXFile(comLoadTheme, comExtractFile, comCompressFile, comProgress, this)
+	{
+	}
+
+	~CAVSOfficePPTXFile()
+	{
+	}
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+	HRESULT FinalConstruct()
+	{
+		return S_OK;
+	}
+
+	void FinalRelease()
+	{
+	}
+
+public:
+	HRESULT LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions)
+	{
+		return m_oCPPTXFile.LoadFromFile(sSrcFileName, sDstPath, sXMLOptions);
+	}
+public:
+	HRESULT SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
+	{
+		return m_oCPPTXFile.SaveToFile(sDstFileName, sSrcPath, sXMLOptions);
+	}
+
+public:
+	STDMETHOD(get_TempDirectory)(BSTR* pVal)
+	{
+		return m_oCPPTXFile.get_TempDirectory(pVal);
+	}
+	STDMETHOD(put_TempDirectory)(BSTR newVal)
+	{
+		return m_oCPPTXFile.put_TempDirectory(newVal);
+	}
+public:
+	STDMETHOD(GetDVDXml)(BSTR* pbstrPTTXml)
+	{
+		return m_oCPPTXFile.GetDVDXml(pbstrPTTXml);
+	}
+	STDMETHOD(GetBluRayXml)(BSTR* pbstrDVDXml)
+	{
+		return m_oCPPTXFile.GetBluRayXml(pbstrDVDXml);
+	}
+public:
+	STDMETHOD(get_DrawingXml)(BSTR* pVal)
+	{
+		return m_oCPPTXFile.get_DrawingXml(pVal);
+	}
+
+	STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue)
+	{
+		return m_oCPPTXFile.SetAdditionalParam(ParamName, ParamValue);
+	}
+
+	STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue)
+	{
+		return m_oCPPTXFile.GetAdditionalParam(ParamName, ParamValue);
+	}
+
+	// to PPTY
+	STDMETHOD(SetMediaDir)(BSTR bsMediaDir)
+	{
+		return m_oCPPTXFile.SetMediaDir(bsMediaDir);
+	}
+	STDMETHOD(SetFontDir)(BSTR bsFontDir)
+	{
+		return m_oCPPTXFile.SetFontDir(bsFontDir);
+	}
+	STDMETHOD(SetThemesDir)(BSTR bsDir)
+	{
+		return m_oCPPTXFile.SetThemesDir(bsDir);
+	}
+	STDMETHOD(SetUseSystemFonts)(VARIANT_BOOL useSystemFonts)
+	{
+		return m_oCPPTXFile.SetUseSystemFonts(useSystemFonts);
+	}
+	STDMETHOD(OpenFileToPPTY)(BSTR bsInput, BSTR bsOutput)
+	{
+		return m_oCPPTXFile.OpenFileToPPTY(bsInput, bsOutput);
+	}
+	STDMETHOD(OpenDirectoryToPPTY)(BSTR bsInput, BSTR bsOutput)
+	{
+		return m_oCPPTXFile.OpenDirectoryToPPTY(bsInput, bsOutput);
+	}
+	STDMETHOD(ConvertPPTYToPPTX)(BSTR bsInput, BSTR bsOutput)
+	{
+		return m_oCPPTXFile.ConvertPPTYToPPTX(bsInput, bsOutput);
+	}
+	void LoadResourceFile(HINSTANCE hInst, LPCTSTR sResName, LPCTSTR sResType, const CString& strDstFile)
+	{
+		HRSRC hrRes = FindResource(hInst, sResName, sResType);
+		if (!hrRes)
+			return;
+
+		HGLOBAL hGlobal = LoadResource(hInst, hrRes);
+		DWORD sz = SizeofResource(hInst, hrRes);
+		void* ptrRes = LockResource(hGlobal);
+
+		CFile oFile;
+		oFile.CreateFile(strDstFile);
+		oFile.WriteFile(ptrRes, sz);
+
+		UnlockResource(hGlobal);
+		FreeResource(hGlobal);
+	}
+};
+
+void comLoadTheme(void* pArg, int nIndex, CString& strDstFolder)
+{
+	CAVSOfficePPTXFile* pCAVSOfficePPTXFile = static_cast<CAVSOfficePPTXFile*>(pArg);
+	HINSTANCE hInst = _AtlBaseModule.GetModuleInstance();
+
+	CString strThemeNotes = _T("");
+	strThemeNotes.Format(_T("\\ppt\\theme\\theme%d.xml"), nIndex);
+	pCAVSOfficePPTXFile->LoadResourceFile(hInst, MAKEINTRESOURCE(IDB_XML_NOTESTHEME), _T("PPTXW"), strDstFolder + strThemeNotes);
+
+	CDirectory::CreateDirectory(strDstFolder + _T("\\ppt\\notesMasters"));
+	pCAVSOfficePPTXFile->LoadResourceFile(hInst, MAKEINTRESOURCE(IDB_XML_NOTESMASTER), _T("PPTXW"), strDstFolder + _T("\\ppt\\notesMasters\\notesMaster1.xml"));
+
+	CDirectory::CreateDirectory(strDstFolder + _T("\\ppt\\notesMasters\\_rels"));
+	CString strThemeNotesNum = _T("");
+	strThemeNotesNum.Format(_T("%d"), nIndex);
+	CString strVal = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
+						<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\
+						<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme\" Target=\"../theme/theme") + strThemeNotesNum + _T(".xml\"/></Relationships>");
+	CFile oFileRels;
+	oFileRels.CreateFile(strDstFolder + _T("\\ppt\\notesMasters\\_rels\\notesMaster1.xml.rels"));
+	oFileRels.WriteStringUTF8(strVal);
+	oFileRels.CloseFile();
+}
+bool comExtractFile(void* pArg, CString& sFile, CString& sDir)
+{
+	OfficeUtils::IOfficeUtils* pOfficeUtils	= NULL;
+
+	if (S_OK != CoCreateInstance(__uuidof(OfficeUtils::COfficeUtils), NULL, CLSCTX_INPROC_SERVER, __uuidof(OfficeUtils::IOfficeUtils),(void**)&pOfficeUtils))
+		return false;
+
+	BSTR bsFile = sFile.AllocSysString();
+	BSTR bsDir = sDir.AllocSysString();
+	HRESULT hr = pOfficeUtils->ExtractToDirectory( bsFile, bsDir, NULL, 0);
+	SysFreeString(bsFile);
+	SysFreeString(bsDir);
+	if(hr != S_OK)
+		return false;
+
+	RELEASEINTERFACE(pOfficeUtils);
+	return true;
+}
+bool comCompressFile(void* pArg, CString& sDir, CString& sFile)
+{
+	OfficeUtils::IOfficeUtils* pOfficeUtils	= NULL;
+
+	if (S_OK != CoCreateInstance(__uuidof(OfficeUtils::COfficeUtils), NULL, CLSCTX_INPROC_SERVER, __uuidof(OfficeUtils::IOfficeUtils),(void**)&pOfficeUtils))
+		return false;
+
+	BSTR bsDir = sDir.AllocSysString();
+	BSTR bsFile = sFile.AllocSysString();
+	HRESULT hr = pOfficeUtils->CompressFileOrDirectory( bsDir, bsFile, -1 );
+	SysFreeString(bsDir);
+	SysFreeString(bsFile);
+	if(hr != S_OK)
+		return false;
+
+	RELEASEINTERFACE(pOfficeUtils);
+	return true;
+}
+bool comProgress(void* pArg, long ID, long Percent)
+{
+	CAVSOfficePPTXFile* pCAVSOfficePPTXFile = static_cast<CAVSOfficePPTXFile*>(pArg);
+	SHORT res = 0;
+	pCAVSOfficePPTXFile->OnProgressEx(ID, Percent, &res);
+	return (res != 0);
+}
\ No newline at end of file

ASCOfficeDocxFile2/Resource.h

@@ -11,6 +11,8 @@
 #define IDB_DEFAULT_DOC_THEME			204
 #define IDB_DEFAULT_DOC_WEBSETTINGS		205
 #define IDB_DEFAULT_XLSX_THEME			206
+#define IDB_XML_NOTESTHEME				207
+#define IDB_XML_NOTESMASTER				208
 
 // Next default values for new objects
 // 

ASCOfficeDocxFile2/stdafx.h

@@ -75,6 +75,7 @@ namespace ASCGraphics
 
 #endif
 
+#import "../Redist/ASCOfficeUtils.dll"			named_guids raw_interfaces_only rename_namespace("OfficeUtils")
 #import "../Redist/ASCOfficePPTXFile.dll"	named_guids raw_interfaces_only rename_namespace("PPTXFile"), exclude("_IAVSOfficeFileTemplateEvents"), exclude("_IAVSOfficeFileTemplateEvents2"), exclude("IASCRenderer")
 
 #include "../Common/DocxFormat/Source/DocxFormat/Docx.h"

ASCPresentationEditor/stdafx.h

@@ -62,13 +62,14 @@ using namespace Gdiplus;
 #import "../Redist/ASCHTMLRenderer.dll"		named_guids rename_namespace("HTMLRenderer"), raw_interfaces_only, exclude("IASCRenderer")
 
 #import "../Redist/ASCOfficePPTFile.dll"	named_guids rename_namespace("PPTFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
-#import "../Redist/ASCOfficePPTXFile.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
+//#import "../Redist/ASCOfficePPTXFile.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
+#import "../Redist/ASCOfficeDocxFile2.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
 //#import "../Redist/ASCOfficeOdpFile.dll"	named_guids rename_namespace("ODPFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
 #import "../Redist/ASCOfficePDFWriter.dll"	named_guids rename_namespace("PDFFile"),  raw_interfaces_only, exclude("IASCRenderer")
 
 #define USE_ODF_FILE
 
 #ifdef USE_ODF_FILE
-#import "../Redist/ASCOfficeOdfFile.dll"	named_guids raw_interfaces_only rename_namespace("ODFFile")
+#import "../Redist/ASCOfficeOdfFile.dll"	named_guids raw_interfaces_only rename_namespace("ODFFile"), exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
 #endif
 

ASCPresentationEditor/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//36
-#define INTVER 1,0,0,36
-#define STRVER "1,0,0,36\0"
+//37
+#define INTVER 1,0,0,37
+#define STRVER "1,0,0,37\0"