Skip to content

O
onlyoffice_core
Commit 9098a715 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov
Browse files
Options

Общий BinaryReaderWriter 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58393 954022d7-b5bf-4e40-9824-e11837661b57
parent acdb424b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4367 additions and 4749 deletions
ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj
View file @ 9098a715
......@@ -716,10 +716,6 @@
RelativePath=".\BinWriter\BinWriters.h"
>
</File>
<File
RelativePath=".\BinWriter\StreamUtils.h"
>
</File>
</Filter>
</Filter>
<File
......
ASCOfficeDocxFile2/BinReader/Readers.h
View file @ 9098a715
This diff is collapsed.
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ 9098a715
This diff is collapsed.
ASCOfficeDocxFile2/BinWriter/StreamUtils.h deleted 100644 → 0
View file @ acdb424b
This diff is collapsed.
ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp
View file @ 9098a715
......@@ -32,10 +32,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(std::wstring& sSrcFileName, std::wst
CString mediaDir = path.GetDirectory() + _T("media\\");
NSDirectory::CreateDirectory(string2std_string(mediaDir));
Streams::CBuffer oBuffer;
oBuffer.Create(BUFFER_GROW_SIZE, BUFFER_GROW_SIZE);
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
NSBinPptxRW::CBinaryFileWriter oBufferedStream;
#ifdef _WIN32
DocWrapper::FontProcessor fp;
......@@ -171,10 +168,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(std::wstring& sSrcFileName, std::w
LPSAFEARRAY pArray = SafeArrayCreate(VT_UI1, 1, rgsabound);
if(FALSE != Base64::Base64Decode((LPCSTR)(pBase64Data + nIndex), nBase64DataSize - nIndex, (BYTE*)pArray->pvData, &nDataSize))
{
Streams::CBuffer oBuffer;
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
oBufferedStream.Create((BYTE*)pArray->pvData, nDataSize);
NSBinPptxRW::CBinaryFileReader oBufferedStream;
oBufferedStream.Init((BYTE*)pArray->pvData, 0, nDataSize);
int nVersion = g_nFormatVersion;
if(version.GetLength() > 0)
......@@ -243,13 +238,10 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(std::wstring& sSrcFileName, std::w
}
bool BinDocxRW::CDocxSerializer::getXmlContent(unsigned char* pBinaryObj, long lSize, long lStart, long lLength, std::wstring& sOutputXml)
{
Streams::CBuffer oBuffer;
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
oBufferedStream.Create(pBinaryObj, lSize);
NSBinPptxRW::CBinaryFileReader oBufferedStream;
oBufferedStream.Init(pBinaryObj, lStart, lSize);
oBufferedStream.Seek(lStart);
long nLength = oBufferedStream.ReadLong();
long nLength = oBufferedStream.GetLong();
Writers::ContentWriter oTempContentWriter;
BinDocxRW::Binary_DocumentTableReader oBinary_DocumentTableReader(oBufferedStream, *m_pCurFileWriter, oTempContentWriter, NULL);
......@@ -262,10 +254,7 @@ bool BinDocxRW::CDocxSerializer::getBinaryContent(std::wstring& bsTxContent, uns
{
if(NULL == m_oBinaryFileWriter)
return false;
Streams::CBuffer oBuffer;
oBuffer.Create(BUFFER_GROW_SIZE, BUFFER_GROW_SIZE);
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
NSBinPptxRW::CBinaryFileWriter oBufferedStream;
XmlUtils::CXmlLiteReader oReader;
oReader.FromString(std_string2string(bsTxContent));
......
ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h
View file @ 9098a715
#ifndef DOCX_SERIALIZER
#define DOCX_SERIALIZER
//todo
#include <atlbase.h>
#include <atlstr.h>
#include <string>
namespace Writers{
......
ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp
View file @ 9098a715
......@@ -101,10 +101,7 @@ namespace BinXlsxRW{
OOX::Spreadsheet::CChartSpace oChart(sChartPath);
if(NULL != m_pExternalDrawingConverter)
{
Streams::CBuffer oBuffer;
oBuffer.Create(BUFFER_GROW_SIZE, BUFFER_GROW_SIZE);
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
NSBinPptxRW::CBinaryFileWriter oBufferedStream;
BinXlsxRW::BinaryCommonWriter oBcw(oBufferedStream);
BSTR bstrChartPath = sChartPath.AllocSysString();
......@@ -131,10 +128,8 @@ namespace BinXlsxRW{
*sContentTypeElement = NULL;
if(NULL != m_pExternalDrawingConverter)
{
Streams::CBuffer oBuffer;
Streams::CBufferedStream oBufferedStream;
oBufferedStream.SetBuffer(&oBuffer);
oBufferedStream.Create((BYTE*)pBinaryObj->pvData + lStart, lLength);
NSBinPptxRW::CBinaryFileReader oBufferedStream;
oBufferedStream.Init((BYTE*)pBinaryObj->pvData, lStart, lLength);
m_pExternalDrawingConverter->SetDstContentRels();
......
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @ 9098a715
......@@ -816,7 +816,7 @@ CDrawingConverter::~CDrawingConverter()
HRESULT CDrawingConverter::SetMainDocument(BinDocxRW::CDocxSerializer* pDocument)
{
m_pBinaryWriter->ClearNoAttack();
m_pBinaryWriter->m_oCommon.m_oImageManager.NewDocument();
m_pBinaryWriter->m_pCommon->m_pImageManager->NewDocument();
m_pBinaryWriter->SetMainDocument(pDocument);
m_pReader->SetMainDocument(pDocument);
m_lNextId = 1;
......@@ -830,8 +830,8 @@ HRESULT CDrawingConverter::SetRelsPath(BSTR bsRelsPath)
}
HRESULT CDrawingConverter::SetMediaDstPath(BSTR bsMediaPath)
{
m_pBinaryWriter->m_oCommon.m_oImageManager.m_strDstMedia = (CString)bsMediaPath;
m_pImageManager->SetDstMedia(m_pBinaryWriter->m_oCommon.m_oImageManager.m_strDstMedia);
m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia = (CString)bsMediaPath;
m_pImageManager->SetDstMedia(m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia);
CreateDirectory(bsMediaPath, NULL);
return S_OK;
......@@ -923,7 +923,7 @@ HRESULT CDrawingConverter::AddObject(BSTR bsXml, BSTR* pMainProps, SAFEARRAY** p
strXml += _T("</main>");
m_pBinaryWriter->m_oCommon.CheckFontPicker();
m_pBinaryWriter->m_pCommon->CheckFontPicker();
++m_lCurrentObjectTop;
bool bResult = ParceObject(strXml, pMainProps, ppBinary);
......@@ -1004,14 +1004,14 @@ bool CDrawingConverter::ParceObject(ATL::CString& strXml, BSTR* pMainProps, SAFE
CString strCurrentRelsPath = m_strCurrentRelsPath;
if (_T("dgm:relIds") == oNodeContent.GetName() && m_pBinaryWriter->m_pCommonRels.is_init())
if (_T("dgm:relIds") == oNodeContent.GetName() && m_pBinaryWriter->m_pCommonRels->is_init())
{
nullable<PPTX::RId> id_data;
oNodeContent.ReadAttributeBase(L"r:dm", id_data);
if (id_data.is_init())
{
smart_ptr<PPTX::Image> pDiagData = m_pBinaryWriter->m_pCommonRels->image(*id_data);
smart_ptr<PPTX::Image> pDiagData = (*m_pBinaryWriter->m_pCommonRels)->image(*id_data);
if (pDiagData.is_init())
{
......@@ -1038,7 +1038,7 @@ bool CDrawingConverter::ParceObject(ATL::CString& strXml, BSTR* pMainProps, SAFE
if (id_drawing.is_init())
{
smart_ptr<PPTX::Image> pDiagDW = m_pBinaryWriter->m_pCommonRels->image(*id_drawing);
smart_ptr<PPTX::Image> pDiagDW = (*m_pBinaryWriter->m_pCommonRels)->image(*id_drawing);
if (pDiagDW.is_init())
{
......@@ -3057,7 +3057,7 @@ HRESULT CDrawingConverter::GetThemeBinary(BSTR bsThemeFilePath, SAFEARRAY** ppBi
//m_pBinaryWriter->ClearNoAttack();
ULONG lOldPos = m_pBinaryWriter->GetPosition();
m_pBinaryWriter->m_oCommon.CheckFontPicker();
m_pBinaryWriter->m_pCommon->CheckFontPicker();
pTheme->toPPTY(m_pBinaryWriter);
ULONG lBinarySize = m_pBinaryWriter->GetPosition() - lOldPos;
......@@ -3071,7 +3071,7 @@ HRESULT CDrawingConverter::GetThemeBinary(BSTR bsThemeFilePath, SAFEARRAY** ppBi
m_pBinaryWriter->SetPosition(lOldPos);
m_pBinaryWriter->ThemeDoc = pTheme.smart_dynamic_cast<PPTX::FileContainer>();
*m_pBinaryWriter->ThemeDoc = pTheme.smart_dynamic_cast<PPTX::FileContainer>();
//m_pBinaryWriter->ThemeDoc.reset();
m_strCurrentRelsPath = strOldRels;
......@@ -3607,8 +3607,8 @@ HRESULT CDrawingConverter::GetTxBodyBinary(BSTR bsXml, SAFEARRAY** ppBinary)
//m_pBinaryWriter->ClearNoAttack();
ULONG lOldPos = m_pBinaryWriter->GetPosition();
m_pBinaryWriter->m_oCommon.CheckFontPicker();
//m_pBinaryWriter->m_oCommon.m_pNativePicker->Init(m_strFontDirectory);
m_pBinaryWriter->m_pCommon->CheckFontPicker();
//m_pBinaryWriter->m_pCommon->m_pNativePicker->Init(m_strFontDirectory);
m_pBinaryWriter->WriteRecord1(0, oTxBody);
......@@ -3733,7 +3733,7 @@ xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"");
return S_FALSE;
//m_pBinaryWriter->ClearNoAttack();
m_pBinaryWriter->m_oCommon.CheckFontPicker();
m_pBinaryWriter->m_pCommon->CheckFontPicker();
ULONG lOldPos = m_pBinaryWriter->GetPosition();
......@@ -3883,7 +3883,7 @@ HRESULT CDrawingConverter::SetAdditionalParam(BSTR ParamName, VARIANT ParamValue
else if (name == _T("SerializeImageManager"))
{
NSBinPptxRW::CBinaryFileReader oReader;
oReader.Deserialize(&m_pBinaryWriter->m_oCommon.m_oImageManager, ParamValue.parray);
oReader.Deserialize(m_pBinaryWriter->m_pCommon->m_pImageManager, ParamValue.parray);
}
else if (name == _T("SerializeImageManager2"))
{
......@@ -3895,7 +3895,7 @@ HRESULT CDrawingConverter::SetAdditionalParam(BSTR ParamName, VARIANT ParamValue
IOfficeFontPicker* pFontPicker = NULL;
ParamValue.punkVal->QueryInterface(__uuidof(IOfficeFontPicker), (void**)&pFontPicker);
m_pBinaryWriter->m_oCommon.CreateFontPicker(pFontPicker);
m_pBinaryWriter->m_pCommon->CreateFontPicker(pFontPicker);
RELEASEINTERFACE(pFontPicker);
}
else if (name == _T("DocumentChartsCount") && ParamValue.vt == VT_I4)
......@@ -3912,7 +3912,7 @@ HRESULT CDrawingConverter::GetAdditionalParam(BSTR ParamName, VARIANT* ParamValu
NSBinPptxRW::CBinaryFileWriter oWriter;
ParamValue->vt = VT_ARRAY;
ParamValue->parray = oWriter.Serialize(&m_pBinaryWriter->m_oCommon.m_oImageManager);
ParamValue->parray = oWriter.Serialize(m_pBinaryWriter->m_pCommon->m_pImageManager);
}
else if (name == _T("SerializeImageManager2"))
{
......@@ -3926,8 +3926,8 @@ HRESULT CDrawingConverter::GetAdditionalParam(BSTR ParamName, VARIANT* ParamValu
ParamValue->vt = VT_UNKNOWN;
ParamValue->punkVal = NULL;
if (NULL != m_pBinaryWriter->m_oCommon.m_pFontPicker)
m_pBinaryWriter->m_oCommon.m_pFontPicker->QueryInterface(IID_IUnknown, (void**)&(ParamValue->punkVal));
if (NULL != m_pBinaryWriter->m_pCommon->m_pFontPicker)
m_pBinaryWriter->m_pCommon->m_pFontPicker->QueryInterface(IID_IUnknown, (void**)&(ParamValue->punkVal));
}
else if (name == _T("DocumentChartsCount"))
{
......@@ -3967,6 +3967,6 @@ HRESULT CDrawingConverter::SetCurrentRelsPath()
pPair->m_value->_read(filename);
}
m_pBinaryWriter->m_pCommonRels = pPair->m_value.smart_dynamic_cast<PPTX::FileContainer>();
*m_pBinaryWriter->m_pCommonRels = pPair->m_value.smart_dynamic_cast<PPTX::FileContainer>();
return S_OK;
}
\ No newline at end of file
ASCOfficePPTXFile/ASCOfficePPTXFile.vcproj
View file @ 9098a715
......@@ -546,6 +546,10 @@
RelativePath="..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\BaseShape.cpp"
>
</File>
<File
RelativePath=".\Editor\BinaryFileReaderWriter.cpp"
>
</File>
<File
RelativePath="..\ASCPresentationEditor\OfficeDrawing\Elements.cpp"
>
......@@ -3210,6 +3214,10 @@
<Filter
Name="Editor"
>
<File
RelativePath=".\Editor\BinaryFileReaderWriter.h"
>
</File>
<File
RelativePath=".\Editor\BinReaderWriterDefines.h"
>
......
ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp
View file @ 9098a715
......@@ -235,8 +235,8 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput)
m_strDirectory = m_strDirectory.Mid(0, nIndex);
NSBinPptxRW::CBinaryFileWriter oBinaryWriter;
oBinaryWriter.m_oCommon.CheckFontPicker();
oBinaryWriter.m_oCommon.m_pNativePicker->Init(m_strFontDirectory);
oBinaryWriter.m_pCommon->CheckFontPicker();
oBinaryWriter.m_pCommon->m_pNativePicker->Init(m_strFontDirectory);
CString sDstFileOutput = bsOutput;
m_strMediaDirectory = sDstFileOutput;
......@@ -246,7 +246,7 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput)
oBinaryWriter.m_strMainFolder = m_strMediaDirectory;
m_strMediaDirectory = m_strMediaDirectory + _T("\\media");
oBinaryWriter.m_oCommon.m_oImageManager.m_strDstMedia = m_strMediaDirectory;
oBinaryWriter.m_pCommon->m_pImageManager->m_strDstMedia = m_strMediaDirectory;
CDirectory::CreateDirectory(m_strMediaDirectory);
......@@ -254,10 +254,10 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput)
{
CDirectory::CreateDirectory(m_strEmbeddedFontsDirectory);
if (NULL != oBinaryWriter.m_oCommon.m_pFontPicker)
if (NULL != oBinaryWriter.m_pCommon->m_pFontPicker)
{
oBinaryWriter.m_oCommon.m_pNativePicker->m_bIsEmbeddedFonts = TRUE;
oBinaryWriter.m_oCommon.m_pNativePicker->m_oEmbeddedFonts.m_strEmbeddedFontsFolder = m_strEmbeddedFontsDirectory;
oBinaryWriter.m_pCommon->m_pNativePicker->m_bIsEmbeddedFonts = TRUE;
oBinaryWriter.m_pCommon->m_pNativePicker->m_oEmbeddedFonts.m_strEmbeddedFontsFolder = m_strEmbeddedFontsDirectory;
}
}
......@@ -296,8 +296,8 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(BSTR bsInput, BSTR bsOutput)
m_strDirectory = m_strDirectory.Mid(0, nIndex);
NSBinPptxRW::CBinaryFileWriter oBinaryWriter;
oBinaryWriter.m_oCommon.CheckFontPicker();
oBinaryWriter.m_oCommon.m_pNativePicker->Init(m_strFontDirectory);
oBinaryWriter.m_pCommon->CheckFontPicker();
oBinaryWriter.m_pCommon->m_pNativePicker->Init(m_strFontDirectory);
CString sDstFileOutput = (CString)bsOutput;
m_strMediaDirectory = sDstFileOutput;
......@@ -307,7 +307,7 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(BSTR bsInput, BSTR bsOutput)
oBinaryWriter.m_strMainFolder = m_strMediaDirectory;
m_strMediaDirectory = m_strMediaDirectory + _T("\\media");
oBinaryWriter.m_oCommon.m_oImageManager.m_strDstMedia = m_strMediaDirectory;
oBinaryWriter.m_pCommon->m_pImageManager->m_strDstMedia = m_strMediaDirectory;
CDirectory::CreateDirectory(m_strMediaDirectory);
......
ASCOfficePPTXFile/Editor/BinWriters.h
View file @ 9098a715
This diff is collapsed.
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp 0 → 100644
View file @ 9098a715
This diff is collapsed.
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h 0 → 100644
View file @ 9098a715
This diff is collapsed.
ASCOfficePPTXFile/Editor/Converter.h
View file @ 9098a715
......@@ -11,7 +11,7 @@ namespace PPTX2EditorAdvanced
DWORD Convert(NSBinPptxRW::CBinaryFileWriter& oBinaryWriter, PPTX::Folder& oFolder, const CString& strSourceDirectory, const CString& strDstFile)
{
// main-
NSBinPptxRW::CCommonWriter* pCommon = &oBinaryWriter.m_oCommon;
NSBinPptxRW::CCommonWriter* pCommon = oBinaryWriter.m_pCommon;
CAtlArray<smart_ptr<PPTX::Theme>> _themes;
CAtlArray<smart_ptr<PPTX::SlideMaster>> _slideMasters;
......@@ -38,8 +38,8 @@ namespace PPTX2EditorAdvanced
continue;
}
oBinaryWriter.m_oCommon.m_oRels.Add();
CMasterSlideInfo& oMasterInfo = oBinaryWriter.m_oCommon.m_oRels[oBinaryWriter.m_oCommon.m_oRels.GetCount() - 1];
oBinaryWriter.m_pCommon->m_oRels.Add();
CMasterSlideInfo& oMasterInfo = oBinaryWriter.m_pCommon->m_oRels[oBinaryWriter.m_pCommon->m_oRels.GetCount() - 1];
// mainMaster
LONG lCountSM = (LONG)_slideMasters.GetCount();
......@@ -136,11 +136,11 @@ namespace PPTX2EditorAdvanced
if (NULL == pSearchL)
{
//
oBinaryWriter.m_oCommon.m_oSlide_Layout_Rels.Add(0);
oBinaryWriter.m_pCommon->m_oSlide_Layout_Rels.Add(0);
}
else
{
oBinaryWriter.m_oCommon.m_oSlide_Layout_Rels.Add(pSearchL->m_value);
oBinaryWriter.m_pCommon->m_oSlide_Layout_Rels.Add(pSearchL->m_value);
}
LONG lCountS = (LONG)_slides.GetCount();
......@@ -272,7 +272,7 @@ namespace PPTX2EditorAdvanced
oBinaryWriter.StartRecord(NSMainTables::ImageMap);
oBinaryWriter.WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
CAtlMap<CString, NSShapeImageGen::CImageInfo>* pIMaps = &oBinaryWriter.m_oCommon.m_oImageManager.m_mapImagesFile;
CAtlMap<CString, NSShapeImageGen::CImageInfo>* pIMaps = &oBinaryWriter.m_pCommon->m_pImageManager->m_mapImagesFile;
POSITION pos1 = pIMaps->GetStartPosition();
LONG lIndexI = 0;
......@@ -292,7 +292,7 @@ namespace PPTX2EditorAdvanced
oBinaryWriter.StartRecord(NSMainTables::FontMap);
oBinaryWriter.WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
CAtlMap<CString, CString>* pFMaps = &oBinaryWriter.m_oCommon.m_pNativePicker->m_mapPicks;
CAtlMap<CString, CString>* pFMaps = &oBinaryWriter.m_pCommon->m_pNativePicker->m_mapPicks;
POSITION pos2 = pFMaps->GetStartPosition();
LONG lIndexF = 0;
......@@ -314,10 +314,10 @@ namespace PPTX2EditorAdvanced
oBinaryWriter.StartRecord(NSMainTables::SlideRels);
oBinaryWriter.WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
size_t _s_rels = oBinaryWriter.m_oCommon.m_oSlide_Layout_Rels.GetCount();
size_t _s_rels = oBinaryWriter.m_pCommon->m_oSlide_Layout_Rels.GetCount();
for (size_t i = 0; i < _s_rels; ++i)
{
oBinaryWriter.WriteInt1(0, oBinaryWriter.m_oCommon.m_oSlide_Layout_Rels[i]);
oBinaryWriter.WriteInt1(0, oBinaryWriter.m_pCommon->m_oSlide_Layout_Rels[i]);
}
oBinaryWriter.WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
......@@ -329,7 +329,7 @@ namespace PPTX2EditorAdvanced
oBinaryWriter.StartMainRecord(NSMainTables::ThemeRels);
oBinaryWriter.StartRecord(NSMainTables::ThemeRels);
CAtlArray<NSBinPptxRW::CMasterSlideInfo>* th_rels = &oBinaryWriter.m_oCommon.m_oRels;
CAtlArray<NSBinPptxRW::CMasterSlideInfo>* th_rels = &oBinaryWriter.m_pCommon->m_oRels;
oBinaryWriter.WriteULONG((ULONG)th_rels->GetCount());
for (size_t i = 0; i < th_rels->GetCount(); i++)
......
ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuChar.h
View file @ 9098a715
......@@ -53,8 +53,8 @@ namespace PPTX
pWriter->EndRecord();
if (pWriter->m_oCommon.m_pNativePicker->m_bIsEmbeddedFonts)
pWriter->m_oCommon.m_pNativePicker->m_oEmbeddedFonts.CheckString(Char);
if (pWriter->m_pCommon->m_pNativePicker->m_bIsEmbeddedFonts)
pWriter->m_pCommon->m_pNativePicker->m_oEmbeddedFonts.CheckString(Char);
}
public:
......
ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.h
View file @ 9098a715
......@@ -96,10 +96,10 @@ namespace PPTX
double dH = pWriter->GetHeightMM();
FileContainer* pRels = NULL;
if (pWriter->m_pCommonRels.is_init())
pRels = pWriter->m_pCommonRels.operator ->();
if (pWriter->m_pCommonRels->is_init())
pRels = pWriter->m_pCommonRels->operator ->();
NSShapeImageGen::CImageInfo oId = pWriter->m_oCommon.m_oImageManager.WriteImage(this->GetFullPicName(pRels), dX, dY, dW, dH);
NSShapeImageGen::CImageInfo oId = pWriter->m_pCommon->m_pImageManager->WriteImage(this->GetFullPicName(pRels), dX, dY, dW, dH);
CString s = oId.GetPath2();
pWriter->StartRecord(3);
......
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
View file @ 9098a715
......@@ -233,7 +233,7 @@ namespace PPTX
double dY = 0;
double dW = 200;
double dH = 200;
NSShapeImageGen::CImageInfo oId = pWriter->m_oCommon.m_oImageManager.WriteImage(GetPathBySpid().m_strFilename, dX, dY, dW, dH);
NSShapeImageGen::CImageInfo oId = pWriter->m_pCommon->m_pImageManager->WriteImage(GetPathBySpid().m_strFilename, dX, dY, dW, dH);
CString s = oId.GetPath2();
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
......
ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
View file @ 9098a715
......@@ -57,7 +57,7 @@ namespace PPTX
pWriter->WriteString1(3, typeface);
*/
CString sPick = pWriter->m_oCommon.m_pNativePicker->GetTypefacePick(*this);
CString sPick = pWriter->m_pCommon->m_pNativePicker->GetTypefacePick(*this);
pWriter->WriteString1(3, sPick);
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
......
ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
View file @ 9098a715
This diff is collapsed.
XlsxSerializerCom/Reader/BinaryWriter.h
View file @ 9098a715
This diff is collapsed.
XlsxSerializerCom/Reader/CommonWriter.cpp
View file @ 9098a715
This diff is collapsed.
XlsxSerializerCom/Reader/CommonWriter.h
View file @ 9098a715
This diff is collapsed.
XlsxSerializerCom/Writer/BinaryReader.h
View file @ 9098a715
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7