Commit 3278762b authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

(2.0.0.240): ASCOfficeDocxFile2

Bug 27456 - [Docx] При открытии документа теряется пробел.
Bug 27422 - Отчет Audit Trail, генерируемый порталом не открывается, и вызывает ошибку в консоли.
вернул назад некоторые разделители из-за проблем с записью themeoverride в xlsx

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59590 954022d7-b5bf-4e40-9824-e11837661b57
parent 945d20bc
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
//2 //2
//0 //0
//0 //0
//239 //240
#define INTVER 2,0,0,239 #define INTVER 2,0,0,240
#define STRVER "2,0,0,239\0" #define STRVER "2,0,0,240\0"
...@@ -3042,7 +3042,7 @@ namespace BinXlsxRW { ...@@ -3042,7 +3042,7 @@ namespace BinXlsxRW {
sDstPath += _T("Temp"); sDstPath += _T("Temp");
OOX::Spreadsheet::CXlsx oXlsx; OOX::Spreadsheet::CXlsx oXlsx;
SaveParams oSaveParams(sDstPath + _T("/") + OOX::Spreadsheet::FileTypes::Workbook.DefaultDirectory().GetPath() + _T("/") + OOX::FileTypes::Theme.DefaultDirectory().GetPath()); SaveParams oSaveParams(sDstPath + _T("\\") + OOX::Spreadsheet::FileTypes::Workbook.DefaultDirectory().GetPath() + _T("\\") + OOX::FileTypes::Theme.DefaultDirectory().GetPath());
ReadMainTable(oXlsx, oBufferedStream, OOX::CPath(sSrcFileName).GetDirectory(), sDstPath, oSaveParams, pOfficeDrawingConverter); ReadMainTable(oXlsx, oBufferedStream, OOX::CPath(sSrcFileName).GetDirectory(), sDstPath, oSaveParams, pOfficeDrawingConverter);
CString sAdditionalContentTypes = oSaveParams.sAdditionalContentTypes; CString sAdditionalContentTypes = oSaveParams.sAdditionalContentTypes;
if(NULL != pOfficeDrawingConverter) if(NULL != pOfficeDrawingConverter)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment