(1.0.0.115): XlsxSerializerCom

SourceFileDir2, поправлен SaveChart для ThemeOverride, при записи ThemeOverride поправлена запись ContentTypes.

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

XlsxSerializerCom/ASCOfficeXlsxSerizer.h

@@ -81,7 +81,7 @@ public:
 		VARIANT var;
 		var.vt = VT_BSTR;
 		var.bstrVal = sFileInDir.AllocSysString();
-		pOfficeDrawingConverter->SetAdditionalParam(L"SourceFileDir", var);
+		pOfficeDrawingConverter->SetAdditionalParam(L"SourceFileDir2", var);
 		RELEASESYSSTRING(var.bstrVal);
 
 		CString sThemeDir;sThemeDir.Format(_T("%s\\xl\\%s"), sDstPath, OOX::FileTypes::Theme.DefaultDirectory());
@@ -199,8 +199,17 @@ public:
 
 			m_pExternalDrawingConverter->SetDstContentRels();
 
+			CString sFilename = bsFilename;
+			// sThemePath  bsFilename    theme     bsFilename
+			CString sThemePath;
+			CString sFilenameReverse = sFilename;sFilenameReverse.MakeReverse();
+			int nIndex = sFilenameReverse.Find('\\');
+			nIndex = sFilenameReverse.Find('\\', nIndex + 1);
+			if(-1 != nIndex)
+				sThemePath = sFilename.Left(sFilename.GetLength() - nIndex) + _T("theme");
+
 			//todo theme path
-			BinXlsxRW::SaveParams oSaveParams(CString(_T("")));
+			BinXlsxRW::SaveParams oSaveParams(sThemePath);
 			OOX::Spreadsheet::CChartSpace oChartSpace;
 			BinXlsxRW::BinaryChartReader oBinaryChartReader(oBufferedStream, oSaveParams, pBinaryObj, m_pExternalDrawingConverter);
 			oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);

XlsxSerializerCom/Reader/ChartFromToBinary.cpp

@@ -961,7 +961,17 @@ namespace BinXlsxRW{
 			BSTR bstrThemeOverrideRelsPath = sThemeOverrideRelsPath.AllocSysString();
 			m_pOfficeDrawingConverter->WriteRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/themeOverride"), bstrThemeOverrideRelsPath, NULL, &rId);
 			SysFreeString(bstrThemeOverrideRelsPath);
-			m_oSaveParams.sAdditionalContentTypes.AppendFormat(_T("<Override PartName=\"/xl/theme/%s\" ContentType=\"application/vnd.openxmlformats-officedocument.themeOverride+xml\"/>"), sThemeOverrideName);
+
+			CString sThemePathReverse = m_oSaveParams.sThemePath;sThemePathReverse.MakeReverse();
+			CString sContentTypesPath;
+			int nIndex = sThemePathReverse.Find('\\');
+			nIndex = sThemePathReverse.Find('\\', nIndex + 1);
+			if(-1 != nIndex)
+			{
+				CString sContentTypesPath = m_oSaveParams.sThemePath.Right(nIndex);
+				sContentTypesPath.Replace('\\', '/');
+				m_oSaveParams.sAdditionalContentTypes.AppendFormat(_T("<Override PartName=\"/%s/%s\" ContentType=\"application/vnd.openxmlformats-officedocument.themeOverride+xml\"/>"), sContentTypesPath, sThemeOverrideName);
+			}
 
 			res = c_oSerConstants::ReadUnknown;
 		}

XlsxSerializerCom/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//114
-#define INTVER 1,0,0,114
-#define STRVER "1,0,0,114\0"
+//115
+#define INTVER 1,0,0,115
+#define STRVER "1,0,0,115\0"