Skip to content

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

добавлены константы в некоторые методы, правки для Variant 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58915 954022d7-b5bf-4e40-9824-e11837661b57
parent 966471b3
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 54 deletions
ASCOfficeDocxFile2/BinReader/ContentTypesWriter.h
View file @ 1e8dab25
......@@ -37,7 +37,7 @@ namespace Writers
CString sOverride;sOverride.Format(_T("<Override PartName=\"%s\" ContentType=\"%s\"/>"),PartName , ContentType);
m_oAdditional.WriteString(sOverride);
}
void AddOverrideRaw(CString& sXml)
void AddOverrideRaw(const CString& sXml)
{
m_oAdditional.WriteString(sXml);
}
......
ASCOfficeDocxFile2/BinReader/Readers.h
View file @ 1e8dab25
......@@ -5,6 +5,7 @@
#include "../BinWriter/BinReaderWriterDefines.h"
#include "ReaderClasses.h"
#include "../../XlsxSerializerCom/Writer/BinaryReader.h"
#include "../../DesktopEditor/common/ASCVariant.h"
namespace BinDocxRW {
......@@ -5276,7 +5277,7 @@ public:
{
VARIANT var;
var.vt = VT_I4;
var.intVal = m_oFileWriter.m_oChartWriter.getChartCount();
var.lVal = m_oFileWriter.m_oChartWriter.getChartCount();
m_oFileWriter.m_pDrawingConverter->SetAdditionalParam(CString(_T("DocumentChartsCount")), var);
long nCurPos = m_oBufferedStream.GetPos();
......@@ -5287,7 +5288,7 @@ public:
VARIANT vt;
m_oFileWriter.m_pDrawingConverter->GetAdditionalParam(CString(_T("DocumentChartsCount")), &vt);
if(VT_I4 == vt.vt)
m_oFileWriter.m_oChartWriter.setChartCount(vt.intVal);
m_oFileWriter.m_oChartWriter.setChartCount(vt.lVal);
if(NULL != bstrDrawingXml && false == bstrDrawingXml->IsEmpty())
{
......
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ 1e8dab25
......@@ -2332,9 +2332,11 @@ namespace BinDocxRW
nCurPos = m_oBcw.WriteItemStart(c_oSerNumTypes::lvl_LvlTextItem);
m_oBcw.m_oStream.WriteBYTE(c_oSerNumTypes::lvl_LvlTextItemText);
m_oBcw.m_oStream.WriteStringW(CString(text[i]));
CString strChar;
strChar.AppendChar(text[i]);
m_oBcw.m_oStream.WriteStringW(strChar);
if(NULL != m_oBcw.m_pEmbeddedFontsManager)
m_oBcw.m_pEmbeddedFontsManager->CheckString(CString(text[i]));
m_oBcw.m_pEmbeddedFontsManager->CheckString(strChar);
m_oBcw.WriteItemEnd(nCurPos);
}
......
ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp
View file @ 1e8dab25
......@@ -175,9 +175,14 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(CString& sSrcFileName, CString& sD
VARIANT var;
var.vt = VT_BSTR;
#ifdef _WIN32
var.bstrVal = sFileInDir.AllocSysString();
oDrawingConverter.SetAdditionalParam(CString(L"SourceFileDir"), var);
RELEASESYSSTRING(var.bstrVal);
#else
var.bstrVal = sFileInDir.GetString();
oDrawingConverter.SetAdditionalParam(CString(L"SourceFileDir"), var);
#endif
BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
oBinaryFileReader.ReadFile();
......@@ -246,7 +251,8 @@ bool BinDocxRW::CDocxSerializer::getBinaryContent(CString& bsTxContent, NSBinPpt
BinDocxRW::BinaryCommonWriter oBinaryCommonWriter(oParamsWriter);
int nCurPos = oBinaryCommonWriter.WriteItemWithLengthStart();
BinDocxRW::BinaryDocumentTableWriter oBinaryDocumentTableWriter(oParamsWriter, BinDocxRW::ParamsDocumentWriter(oParamsWriter.m_pCurRels, oParamsWriter.m_sCurDocumentPath), NULL, NULL);
BinDocxRW::ParamsDocumentWriter oParams(oParamsWriter.m_pCurRels, oParamsWriter.m_sCurDocumentPath);
BinDocxRW::BinaryDocumentTableWriter oBinaryDocumentTableWriter(oParamsWriter, oParams, NULL, NULL);
oBinaryDocumentTableWriter.WriteDocumentContent(oSdtContent.m_arrItems);
oBinaryCommonWriter.WriteItemWithLengthEnd(nCurPos);
......
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @ 1e8dab25
......@@ -815,7 +815,7 @@ HRESULT CDrawingConverter::SetMainDocument(BinDocxRW::CDocxSerializer* pDocument
m_lNextId = 1;
return S_OK;
}
HRESULT CDrawingConverter::SetRelsPath(CString& bsRelsPath)
HRESULT CDrawingConverter::SetRelsPath(const CString& bsRelsPath)
{
// - - ??
m_strCurrentRelsPath = bsRelsPath;
......@@ -825,7 +825,7 @@ CString CDrawingConverter::GetRelsPath()
{
return m_strCurrentRelsPath;
}
HRESULT CDrawingConverter::SetMediaDstPath(CString& bsMediaPath)
HRESULT CDrawingConverter::SetMediaDstPath(const CString& bsMediaPath)
{
m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia = (CString)bsMediaPath;
m_pImageManager->SetDstMedia(m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia);
......@@ -833,7 +833,7 @@ HRESULT CDrawingConverter::SetMediaDstPath(CString& bsMediaPath)
CreateDirectory(bsMediaPath, NULL);
return S_OK;
}
HRESULT CDrawingConverter::AddShapeType(CString& bsXml)
HRESULT CDrawingConverter::AddShapeType(const CString& bsXml)
{
CString strXml = _T("<main ");
......@@ -887,7 +887,7 @@ HRESULT CDrawingConverter::AddShapeType(CString& bsXml)
return S_OK;
}
HRESULT CDrawingConverter::AddObject(CString& bsXml, CString** pMainProps)
HRESULT CDrawingConverter::AddObject(const CString& bsXml, CString** pMainProps)
{
CString strXml = _T("<main ");
......@@ -934,7 +934,7 @@ HRESULT CDrawingConverter::AddObject(CString& bsXml, CString** pMainProps)
return bResult ? S_OK : S_FALSE;
}
bool CDrawingConverter::ParceObject(ATL::CString& strXml, CString** pMainProps)
bool CDrawingConverter::ParceObject(const ATL::CString& strXml, CString** pMainProps)
{
XmlUtils::CXmlNode oMainNode;
if (!oMainNode.FromXmlString(strXml))
......@@ -2528,7 +2528,7 @@ CString CDrawingConverter::GetVMLShapeXml(CPPTShape* pPPTShape)
return oXmlWriter.GetXmlString();
}
void CDrawingConverter::SendMainProps(CString& strMainProps, CString**& pMainProps)
void CDrawingConverter::SendMainProps(const CString& strMainProps, CString**& pMainProps)
{
*pMainProps = new CString();
**pMainProps = strMainProps;
......@@ -3030,7 +3030,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem& oElem, XmlUtils::
}
}
HRESULT CDrawingConverter::GetThemeBinary(BYTE** ppBinary, long& lBinarySize, CString& bsThemeFilePath)
HRESULT CDrawingConverter::GetThemeBinary(BYTE** ppBinary, long& lBinarySize, const CString& bsThemeFilePath)
{
if(NULL == ppBinary)
return S_FALSE;
......@@ -3066,7 +3066,7 @@ HRESULT CDrawingConverter::GetThemeBinary(BYTE** ppBinary, long& lBinarySize, CS
return S_OK;
}
HRESULT CDrawingConverter::LoadClrMap(CString& bsXml)
HRESULT CDrawingConverter::LoadClrMap(const CString& bsXml)
{
smart_ptr<PPTX::Logic::ClrMap> pClrMap = new PPTX::Logic::ClrMap();
......@@ -3083,7 +3083,7 @@ HRESULT CDrawingConverter::LoadClrMap(CString& bsXml)
return S_OK;
}
HRESULT CDrawingConverter::SaveThemeXml(LONG lStart, LONG lLength, CString& bsThemePath)
HRESULT CDrawingConverter::SaveThemeXml(LONG lStart, LONG lLength, const CString& bsThemePath)
{
if (bsThemePath.IsEmpty())
return S_FALSE;
......@@ -3120,7 +3120,7 @@ HRESULT CDrawingConverter::SaveThemeXml(LONG lStart, LONG lLength, CString& bsTh
return S_OK;
}
HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, CString& bsMainProps, CString** bsXml)
HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, const CString& bsMainProps, CString** bsXml)
{
if (bsXml == NULL)
return S_OK;
......@@ -3248,7 +3248,7 @@ HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, CString& bsMain
return S_OK;
}
HRESULT CDrawingConverter::SaveObjectEx(LONG lStart, LONG lLength, CString& bsMainProps, LONG lDocType, CString** bsXml)
HRESULT CDrawingConverter::SaveObjectEx(LONG lStart, LONG lLength, const CString& bsMainProps, LONG lDocType, CString** bsXml)
{
if (XMLWRITER_DOC_TYPE_DOCX == lDocType)
{
......@@ -3299,7 +3299,7 @@ HRESULT CDrawingConverter::SaveObjectEx(LONG lStart, LONG lLength, CString& bsMa
return S_OK;
}
void CDrawingConverter::ConvertShapeVML(PPTX::Logic::SpTreeElem& oElem, CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter)
void CDrawingConverter::ConvertShapeVML(PPTX::Logic::SpTreeElem& oElem, const CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter)
{
if (bsMainProps)
{
......@@ -3311,7 +3311,7 @@ void CDrawingConverter::ConvertShapeVML(PPTX::Logic::SpTreeElem& oElem, CString&
oShape.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap);
}
void CDrawingConverter::ConvertGroupVML(PPTX::Logic::SpTreeElem& oElem, CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter)
void CDrawingConverter::ConvertGroupVML(PPTX::Logic::SpTreeElem& oElem, const CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter)
{
if (bsMainProps)
{
......@@ -3324,7 +3324,7 @@ void CDrawingConverter::ConvertGroupVML(PPTX::Logic::SpTreeElem& oElem, CString&
oGroup.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap);
}
void CDrawingConverter::ConvertMainPropsToVML(CString& bsMainProps, NSBinPptxRW::CXmlWriter& pWriter, PPTX::Logic::SpTreeElem& oElem)
void CDrawingConverter::ConvertMainPropsToVML(const CString& bsMainProps, NSBinPptxRW::CXmlWriter& pWriter, PPTX::Logic::SpTreeElem& oElem)
{
XmlUtils::CXmlNode oNode;
if (!oNode.FromXmlString((CString)bsMainProps))
......@@ -3558,7 +3558,7 @@ void CDrawingConverter::ConvertMainPropsToVML(CString& bsMainProps, NSBinPptxRW:
pWriter.m_strStyleMain = oWriter.GetXmlString();
}
HRESULT CDrawingConverter::GetTxBodyBinary(CString& bsXml)
HRESULT CDrawingConverter::GetTxBodyBinary(const CString& bsXml)
{
XmlUtils::CXmlNode oNode;
if (!oNode.FromXmlString((CString)bsXml))
......@@ -3600,13 +3600,13 @@ HRESULT CDrawingConverter::GetTxBodyXml(LONG lStart, LONG lLength, CString** pbs
return S_OK;
}
HRESULT CDrawingConverter::SetFontDir(CString& bsFontDir)
HRESULT CDrawingConverter::SetFontDir(const CString& bsFontDir)
{
m_strFontDirectory = (CString)bsFontDir;
return S_OK;
}
HRESULT CDrawingConverter::GetRecordBinary(LONG lRecordType, CString& bsXml)
HRESULT CDrawingConverter::GetRecordBinary(LONG lRecordType, const CString& bsXml)
{
if (bsXml.IsEmpty())
return S_FALSE;
......@@ -3769,7 +3769,7 @@ HRESULT CDrawingConverter::SetDstContentRels()
}
return S_OK;
}
HRESULT CDrawingConverter::SaveDstContentRels(CString& bsRelsPath)
HRESULT CDrawingConverter::SaveDstContentRels(const CString& bsRelsPath)
{
m_pReader->m_pRels->CloseRels();
m_pReader->m_pRels->SaveRels((CString)bsRelsPath);
......@@ -3793,7 +3793,7 @@ HRESULT CDrawingConverter::SaveDstContentRels(CString& bsRelsPath)
return S_OK;
}
HRESULT CDrawingConverter::WriteRels(CString& bsType, CString& bsTarget, CString& bsTargetMode, LONG* lId)
HRESULT CDrawingConverter::WriteRels(const CString& bsType, const CString& bsTarget, const CString& bsTargetMode, LONG* lId)
{
if (NULL == lId)
return S_FALSE;
......@@ -3806,7 +3806,7 @@ HRESULT CDrawingConverter::SetFontPicker(COfficeFontPicker* pFontPicker)
m_pBinaryWriter->m_pCommon->CreateFontPicker(pFontPicker);
return S_OK;
}
HRESULT CDrawingConverter::SetAdditionalParam(CString& ParamName, VARIANT ParamValue)
HRESULT CDrawingConverter::SetAdditionalParam(const CString& ParamName, VARIANT ParamValue)
{
CString name = (CString)ParamName;
if (name == _T("SourceFileDir"))
......@@ -3841,7 +3841,7 @@ HRESULT CDrawingConverter::SetAdditionalParam(CString& ParamName, VARIANT ParamV
}
return S_OK;
}
HRESULT CDrawingConverter::GetAdditionalParam(CString& ParamName, VARIANT* ParamValue)
HRESULT CDrawingConverter::GetAdditionalParam(const CString& ParamName, VARIANT* ParamValue)
{
CString name = (CString)ParamName;
if (name == _T("SerializeImageManager"))
......
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
View file @ 1e8dab25
......@@ -5,7 +5,7 @@
#include <atlbase.h>
#include <atlstr.h>
#else
#include "../../../../DesktopEditor/common/ASCVariant.h"
#include "../DesktopEditor/common/ASCVariant.h"
#endif
#include "../Common/DocxFormat/Source/Base/Base.h"
......@@ -178,38 +178,38 @@ namespace NSBinPptxRW
~CDrawingConverter();
public:
HRESULT SetMainDocument (BinDocxRW::CDocxSerializer* pDocument);
HRESULT SetRelsPath (CString& bsRelsPath);
HRESULT SetRelsPath (const CString& bsRelsPath);
CString GetRelsPath();
HRESULT SetMediaDstPath (CString& bsMediaPath);
HRESULT SetMediaDstPath (const CString& bsMediaPath);
HRESULT AddShapeType(CString& bsXml);
HRESULT AddObject(CString& bsXml, CString** pMainProps);
HRESULT GetThemeBinary(BYTE** ppBinary, long& lBinarySize, CString& bsThemeFilePath);
HRESULT AddShapeType(const CString& bsXml);
HRESULT AddObject(const CString& bsXml, CString** pMainProps);
HRESULT GetThemeBinary(BYTE** ppBinary, long& lBinarySize, const CString& bsThemeFilePath);
HRESULT SaveThemeXml(LONG lStart, LONG lLength, CString& bsThemePath);
HRESULT SaveObject(LONG lStart, LONG lLength, CString& bsMainProps, CString** bsXml);
HRESULT SaveObjectEx(LONG lStart, LONG lLength, CString& bsMainProps, LONG lDocType, CString** bsXml);
HRESULT SaveThemeXml(LONG lStart, LONG lLength, const CString& bsThemePath);
HRESULT SaveObject(LONG lStart, LONG lLength, const CString& bsMainProps, CString** bsXml);
HRESULT SaveObjectEx(LONG lStart, LONG lLength, const CString& bsMainProps, LONG lDocType, CString** bsXml);
HRESULT GetRecordBinary(LONG lRecordType, CString& bsXml);
HRESULT GetRecordBinary(LONG lRecordType, const CString& bsXml);
HRESULT GetRecordXml(LONG lStart, LONG lLength, LONG lRecType, LONG lDocType, CString** bsXml);
HRESULT SetDstContentRels();
HRESULT SaveDstContentRels(CString& bsRelsPath);
HRESULT WriteRels (CString& bsType, CString& bsTarget, CString& bsTargetMode, LONG* lId);
HRESULT LoadClrMap (CString& bsXml);
HRESULT SaveDstContentRels(const CString& bsRelsPath);
HRESULT WriteRels (const CString& bsType, const CString& bsTarget, const CString& bsTargetMode, LONG* lId);
HRESULT LoadClrMap (const CString& bsXml);
HRESULT(GetTxBodyBinary)(CString& bsXml);
HRESULT(GetTxBodyBinary)(const CString& bsXml);
HRESULT(GetTxBodyXml)(LONG lStart, LONG lLength, CString** pbstrXml);
HRESULT(SetFontDir)(CString& bsFontDir);
HRESULT(SetFontDir)(const CString& bsFontDir);
HRESULT SetFontPicker(COfficeFontPicker* pFontPicker);
HRESULT(SetAdditionalParam)(CString& ParamName, VARIANT ParamValue);
HRESULT(GetAdditionalParam)(CString& ParamName, VARIANT* ParamValue);
HRESULT(SetAdditionalParam)(const CString& ParamName, VARIANT ParamValue);
HRESULT(GetAdditionalParam)(const CString& ParamName, VARIANT* ParamValue);
public:
void SetFontManager(CFontManager* pFontManager);
protected:
bool ParceObject(CString& strXml, CString** pMainProps);
void SendMainProps(CString& strMainProps, CString**& pMainProps);
bool ParceObject(const CString& strXml, CString** pMainProps);
void SendMainProps(const CString& strMainProps, CString**& pMainProps);
PPTX::Logic::SpTreeElem doc_LoadShape(XmlUtils::CXmlNode& oNode, CString**& pMainProps, bool bIsTop = true);
PPTX::Logic::SpTreeElem doc_LoadGroup(XmlUtils::CXmlNode& oNode, CString**& pMainProps, bool bIsTop = true);
......@@ -223,9 +223,9 @@ namespace NSBinPptxRW
void LoadCoordSize(XmlUtils::CXmlNode& oNode, ::CShape* pShape);
CString GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::CCSS& oCssStyles, CSpTreeElemProps& oProps);
void ConvertMainPropsToVML(CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter, PPTX::Logic::SpTreeElem& oElem);
void ConvertShapeVML(PPTX::Logic::SpTreeElem& oShape, CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
void ConvertGroupVML(PPTX::Logic::SpTreeElem& oGroup, CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
void ConvertMainPropsToVML(const CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter, PPTX::Logic::SpTreeElem& oElem);
void ConvertShapeVML(PPTX::Logic::SpTreeElem& oShape, const CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
void ConvertGroupVML(PPTX::Logic::SpTreeElem& oGroup, const CString& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
void Clear();
HRESULT SetCurrentRelsPath();
......
Common/DocxFormat/Source/XlsxFormat/Drawing/CellAnchor.h
View file @ 1e8dab25
......@@ -18,7 +18,7 @@ namespace OOX
{
public:
WritingElementSpreadsheet_AdditionConstructors(CCellAnchor)
CCellAnchor(SimpleTypes::Spreadsheet::CCellAnchorType<>& oAnchorType/* = SimpleTypes::Spreadsheet::CCellAnchorType<>()*/):m_oAnchorType(oAnchorType)
CCellAnchor(const SimpleTypes::Spreadsheet::CCellAnchorType<>& oAnchorType/* = SimpleTypes::Spreadsheet::CCellAnchorType<>()*/):m_oAnchorType(oAnchorType)
{
}
virtual ~CCellAnchor()
......
XlsxSerializerCom/Reader/BinaryWriter.h
View file @ 1e8dab25
......@@ -2634,7 +2634,7 @@ namespace BinXlsxRW {
int nCurPos = 0;
if(NULL != pCommentText && pCommentText->IsInit())
{
CString& sText = (*pCommentText)->ToString();
const CString& sText = (*pCommentText)->ToString();
m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentData::Text);
m_oBcw.m_oStream.WriteStringW(sText);
}
......
XlsxSerializerCom/Writer/BinaryReader.h
View file @ 1e8dab25
......@@ -1772,7 +1772,8 @@ namespace BinXlsxRW {
res = Read1(length, &BinaryWorksheetsTableReader::ReadWorksheet, this, poResult);
if(m_pCurSheet->m_oName.IsInit())
{
const OOX::RId oRId = m_oWorkbook.Add(smart_ptr<OOX::File>(m_pCurWorksheet));
smart_ptr<OOX::File> oCurFile(m_pCurWorksheet);
const OOX::RId oRId = m_oWorkbook.Add(oCurFile);
m_pCurSheet->m_oRid.Init();
m_pCurSheet->m_oRid->SetValue(oRId.get());
m_mapWorksheets [m_pCurSheet->m_oName.get()] = m_pCurWorksheet;
......@@ -2384,7 +2385,7 @@ namespace BinXlsxRW {
{
VARIANT var;
var.vt = VT_I4;
var.intVal = m_pCurDrawing->GetGlobalNumberByType(OOX::Spreadsheet::FileTypes::Charts.OverrideType());
var.lVal = m_pCurDrawing->GetGlobalNumberByType(OOX::Spreadsheet::FileTypes::Charts.OverrideType());
m_pOfficeDrawingConverter->SetAdditionalParam(CString(_T("DocumentChartsCount")), var);
}
......@@ -2397,7 +2398,7 @@ namespace BinXlsxRW {
VARIANT vt;
m_pOfficeDrawingConverter->GetAdditionalParam(CString(_T("DocumentChartsCount")), &vt);
if(VT_I4 == vt.vt)
m_pCurDrawing->SetGlobalNumberByType(OOX::Spreadsheet::FileTypes::Charts.OverrideType(), vt.intVal);
m_pCurDrawing->SetGlobalNumberByType(OOX::Spreadsheet::FileTypes::Charts.OverrideType(), vt.lVal);
}
if(S_OK == hRes && NULL != bstrXml)
{
......
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