pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux build

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59102 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2014-10-22 10:22:13 +00:00
committed by Alexander Trofimov
parent 0f95e91853
commit 5d03e37dd5
9 changed files with 50 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp
View File

@ -104,8 +104,8 @@ namespace PPTX
}
SysFreeString((var.bstrVal));
}
#endif
}
}
}

8
ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
View File

@ -2,9 +2,9 @@
#include "GraphicFrame.h"
#include "SpTree.h"
#include "..\Slide.h"
#include "..\SlideLayout.h"
#include "..\SlideMaster.h"
#include "../Slide.h"
#include "../SlideLayout.h"
#include "../SlideMaster.h"
//#include "../../ASCOfficeDrawingConverter.h"
@ -388,7 +388,7 @@ namespace PPTX
OOX::CPath GraphicFrame::GetPathBySpid()const
{
OOX::CPath filename = _T("");
OOX::CPath filename;
if(parentFileIs<PPTX::Slide>())
filename = parentFileAs<PPTX::Slide>().GetPathBySpid(spid.get_value_or(_T("")));
else if(parentFileIs<PPTX::SlideLayout>())

25
ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.cpp
View File

@ -5,31 +5,8 @@ namespace PPTX
namespace Logic
{
GrpSpPr::GrpSpPr()
{
}
GrpSpPr::~GrpSpPr()
{
}
GrpSpPr::GrpSpPr(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const GrpSpPr& GrpSpPr::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX

27
ASCOfficePPTXFile/PPTXFormat/Logic/NvGraphicFramePr.cpp
View File

@ -5,32 +5,7 @@ namespace PPTX
namespace Logic
{
NvGraphicFramePr::NvGraphicFramePr()
{
}
NvGraphicFramePr::~NvGraphicFramePr()
{
}
NvGraphicFramePr::NvGraphicFramePr(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const NvGraphicFramePr& NvGraphicFramePr::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX

48
ASCOfficePPTXFile/PPTXFormat/Logic/NvGrpSpPr.cpp
View File

@ -5,29 +5,6 @@ namespace PPTX
namespace Logic
{
NvGrpSpPr::NvGrpSpPr()
{
}
NvGrpSpPr::~NvGrpSpPr()
{
}
NvGrpSpPr::NvGrpSpPr(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const NvGrpSpPr& NvGrpSpPr::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
void NvGrpSpPr::fromXML(XmlUtils::CXmlNode& node)
{
cNvPr = node.ReadNode(_T("p:cNvPr"));
@ -35,6 +12,29 @@ namespace PPTX
nvPr = node.ReadNode(_T("p:nvPr"));
FillParentPointersForChilds();
/*
XmlUtils::CXmlNodes oNodes;
if (node.GetNodes(_T("*"), oNodes))
{
int nCount = oNodes.GetCount();
for (int i = 0; i < nCount; ++i)
{
XmlUtils::CXmlNode oNode;
oNodes.GetAt(i, oNode);
CString strName = XmlUtils::GetNameNoNS(oNode.GetName());
if (_T("cNvPr") == strName)
cNvPr = oNode;
else if (_T("cNvGrpSpPr") == strName)
cNvGrpSpPr = oNode;
else if (_T("nvPr") == strName)
nvPr = oNode;
}
}
FillParentPointersForChilds();
from header (old)*/
}
@ -56,4 +56,4 @@ namespace PPTX
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX

45
ASCOfficePPTXFile/PPTXFormat/Logic/NvGrpSpPr.h
View File

@ -29,40 +29,8 @@ namespace PPTX
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
XmlUtils::CXmlNodes oNodes;
if (node.GetNodes(_T("*"), oNodes))
{
int nCount = oNodes.GetCount();
for (int i = 0; i < nCount; ++i)
{
XmlUtils::CXmlNode oNode;
oNodes.GetAt(i, oNode);
CString strName = XmlUtils::GetNameNoNS(oNode.GetName());
if (_T("cNvPr") == strName)
cNvPr = oNode;
else if (_T("cNvGrpSpPr") == strName)
cNvGrpSpPr = oNode;
else if (_T("nvPr") == strName)
nvPr = oNode;
}
}
FillParentPointersForChilds();
}
virtual CString toXML() const
{
XmlUtils::CNodeValue oValue;
oValue.Write(cNvPr);
oValue.Write(cNvGrpSpPr);
oValue.Write(nvPr);
return XmlUtils::CreateNode(_T("p:nvGrpSpPr"), oValue);
}
virtual void fromXML(XmlUtils::CXmlNode& node);
virtual CString toXML() const;
virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
{
@ -129,14 +97,9 @@ namespace PPTX
CNvGrpSpPr cNvGrpSpPr;
NvPr nvPr;
protected:
virtual void FillParentPointersForChilds()
{
cNvPr.SetParentPointer(this);
cNvGrpSpPr.SetParentPointer(this);
nvPr.SetParentPointer(this);
}
virtual void FillParentPointersForChilds();
};
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_SLIDE_NVGRPSPPR_INCLUDE_H_
#endif // PPTX_LOGIC_SLIDE_NVGRPSPPR_INCLUDE_H_

10
ASCOfficePPTXFile/PPTXFormat/Logic/ShapeTextProperties.cpp
View File

@ -11,7 +11,7 @@ namespace PPTX
{
namespace Logic
{
__forceinline WORD GetTextAnchorFromStr(const CString& str)
AVSINLINE WORD GetTextAnchorFromStr(const CString& str)
{
if (str == _T("t")) return 0;
if (str == _T("ctr")) return 1;
@ -19,7 +19,7 @@ namespace PPTX
return 0;
}
__forceinline WORD GetTextAlignFromStr(const CString& str)
AVSINLINE WORD GetTextAlignFromStr(const CString& str)
{
if (str == _T("l")) return 0;
if (str == _T("ctr")) return 1;
@ -31,7 +31,7 @@ namespace PPTX
return 0;
}
__forceinline WORD GetFontAlignFromStr(const CString& str)
AVSINLINE WORD GetFontAlignFromStr(const CString& str)
{
if (str == _T("auto")) return 0;
if (str == _T("base")) return 0;
@ -41,7 +41,7 @@ namespace PPTX
return 0;
}
__forceinline int GetIntegerFromHex(const CString& string)
AVSINLINE int GetIntegerFromHex(const CString& string)
{
return XmlUtils::GetInteger(string);
}
@ -613,4 +613,4 @@ namespace PPTX
m_FontStyle->SetParentFilePointer(pFile);
}
} // namespace Logic
} // namespace PPTX
} // namespace PPTX

8
ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp
View File

@ -1,9 +1,9 @@
//#include "stdafx.h"
#include "./SmartArt.h"
#include "..\Slide.h"
#include "..\SlideLayout.h"
#include "..\SlideMaster.h"
#include "../Slide.h"
#include "../SlideLayout.h"
#include "../SlideMaster.h"
#include "../../ASCOfficeDrawingConverter.h"
#include "../../../ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h"
@ -176,7 +176,7 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"
strDstChart += _T("charts");
if (1 == m_lChartNumber)
{
CDirectory::CreateDirectory(strDstChart);
FileSystem::Directory::CreateDirectory(strDstChart);
}
CString strChart = _T("");
strChart.Format(_T("chart%d.xml"), m_lChartNumber);

8
ASCPresentationEditor/OfficeDrawing/Interactive.h
View File

@ -1,6 +1,10 @@
#pragma once
#include "Attributes.h"
#ifndef WIN32
#include "../../DesktopEditor/common/ASCVariant.h"
#endif
namespace NSPresentationEditor
{
class CTextRange
@ -32,7 +36,7 @@ namespace NSPresentationEditor
{
private:
long m_lType;
VARIANT m_varParameter;
VARIANT m_varParameter;
public:
bool m_bPresent;
@ -64,4 +68,4 @@ namespace NSPresentationEditor
*this = oSrc;
}
};
}
}