Skip to content

O
onlyoffice_core
Commit 0f95e918 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

linux build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59101 954022d7-b5bf-4e40-9824-e11837661b57
parent 04b33105
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 274 deletions
ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.cpp
View file @ 0f95e918
......@@ -5,28 +5,21 @@ namespace PPTX
namespace Logic
{
CNvGrpSpPr::CNvGrpSpPr()
{
}
CNvGrpSpPr::~CNvGrpSpPr()
{
}
CNvGrpSpPr::CNvGrpSpPr(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const CNvGrpSpPr& CNvGrpSpPr::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
CNvGrpSpPr& CNvGrpSpPr::operator=(const CNvGrpSpPr& oSrc)
{
parentFile = oSrc.parentFile;
parentElement = oSrc.parentElement;
noChangeAspect = oSrc.noChangeAspect;
noGrp = oSrc.noGrp;
noMove = oSrc.noMove;
noResize = oSrc.noResize;
noRot = oSrc.noRot;
noSelect = oSrc.noSelect;
noUngrp = oSrc.noUngrp;
return *this;
}
void CNvGrpSpPr::fromXML(XmlUtils::CXmlNode& node)
{
......@@ -62,4 +55,4 @@ namespace PPTX
}
} // namespace Logic
} // namespace PPTX
\ No newline at end of file
} // namespace PPTX
ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.h
View file @ 0f95e918
......@@ -13,54 +13,13 @@ namespace PPTX
public:
PPTX_LOGIC_BASE(CNvGrpSpPr)
CNvGrpSpPr& operator=(const CNvGrpSpPr& oSrc)
{
parentFile = oSrc.parentFile;
parentElement = oSrc.parentElement;
noChangeAspect = oSrc.noChangeAspect;
noGrp = oSrc.noGrp;
noMove = oSrc.noMove;
noResize = oSrc.noResize;
noRot = oSrc.noRot;
noSelect = oSrc.noSelect;
noUngrp = oSrc.noUngrp;
return *this;
}
CNvGrpSpPr& operator=(const CNvGrpSpPr& oSrc);
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
XmlUtils::CXmlNode oNode;
if (node.GetNode(_T("a:grpSpLocks"), oNode))
{
oNode.ReadAttributeBase(L"noChangeAspect", noChangeAspect);
oNode.ReadAttributeBase(L"noGrp", noGrp);
oNode.ReadAttributeBase(L"noMove", noMove);
oNode.ReadAttributeBase(L"noResize", noResize);
oNode.ReadAttributeBase(L"noRot", noRot);
oNode.ReadAttributeBase(L"noSelect", noSelect);
oNode.ReadAttributeBase(L"noUngrp", noUngrp);
}
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node);
virtual CString toXML() const;
virtual CString toXML() const
{
XmlUtils::CAttribute oAttr;
oAttr.Write(_T("noChangeAspect"), noChangeAspect);
oAttr.Write(_T("noGrp"), noGrp);
oAttr.Write(_T("noMove"), noMove);
oAttr.Write(_T("noResize"), noResize);
oAttr.Write(_T("noRot"), noRot);
oAttr.Write(_T("noSelect"), noSelect);
oAttr.Write(_T("noUngrp"), noUngrp);
if (_T("") == oAttr.m_strValue)
return _T("<p:cNvGrpSpPr/>");
return _T("<p:cNvGrpSpPr>") + XmlUtils::CreateNode(_T("a:grpSpLocks"), oAttr) + _T("</p:cNvGrpSpPr>");
}
virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
{
......@@ -216,4 +175,4 @@ namespace PPTX
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_CNVGRPSPPR_INCLUDE_H
\ No newline at end of file
#endif // PPTX_LOGIC_CNVGRPSPPR_INCLUDE_H
ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp
View file @ 0f95e918
......@@ -4,31 +4,13 @@ namespace PPTX
{
namespace Logic
{
EffectDag::EffectDag()
{
}
EffectDag::~EffectDag()
{
}
EffectDag::EffectDag(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const EffectDag& EffectDag::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
void EffectDag::fromXML(XmlUtils::CXmlNode& node)
{
m_name = node.GetName();
node.ReadAttributeBase(L"name", name);
node.ReadAttributeBase(L"type", type);
Effects.RemoveAll();
Effects.clear();
node.LoadArray(_T("*"), Effects);
FillParentPointersForChilds();
......@@ -48,9 +30,9 @@ namespace PPTX
void EffectDag::FillParentPointersForChilds()
{
size_t count = Effects.GetCount();
size_t count = Effects.size();
for(size_t i = 0; i < count; ++i)
Effects[i].SetParentPointer(this);
}
} // namespace Logic
} // namespace PPTX
\ No newline at end of file
} // namespace PPTX
ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.h
View file @ 0f95e918
......@@ -30,28 +30,10 @@ namespace PPTX
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
m_name = node.GetName();
node.ReadAttributeBase(L"name", name);
node.ReadAttributeBase(L"type", type);
Effects.clear();
node.LoadArray(_T("*"), Effects);
FillParentPointersForChilds();
}
virtual CString toXML() const
{
XmlUtils::CAttribute oAttr;
oAttr.Write(_T("name"), name);
oAttr.WriteLimitNullable(_T("type"), type);
virtual void fromXML(XmlUtils::CXmlNode& node);
XmlUtils::CNodeValue oValue;
oValue.WriteArray(Effects);
return XmlUtils::CreateNode(m_name, oAttr, oValue);
}
virtual CString toXML() const;
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
{
......@@ -82,14 +64,9 @@ namespace PPTX
nullable_limit<Limit::EffectContainerType> type;
CString m_name;
protected:
virtual void FillParentPointersForChilds()
{
size_t count = Effects.size();
for(size_t i = 0; i < count; ++i)
Effects[i].SetParentPointer(this);
}
virtual void FillParentPointersForChilds();
};
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_EFFECTDAG_INCLUDE_H_
\ No newline at end of file
#endif // PPTX_LOGIC_EFFECTDAG_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.cpp
View file @ 0f95e918
......@@ -4,24 +4,7 @@ namespace PPTX
{
namespace Logic
{
EffectLst::EffectLst()
{
}
EffectLst::~EffectLst()
{
}
EffectLst::EffectLst(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const EffectLst& EffectLst::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
void EffectLst::fromXML(XmlUtils::CXmlNode& node)
{
......@@ -74,4 +57,4 @@ namespace PPTX
}
} // namespace Logic
} // namespace PPTX
\ No newline at end of file
} // namespace PPTX
ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.h
View file @ 0f95e918
......@@ -23,53 +23,12 @@ namespace PPTX
PPTX_LOGIC_BASE(EffectLst)
EffectLst& operator=(const EffectLst& oSrc)
{
parentFile = oSrc.parentFile;
parentElement = oSrc.parentElement;
blur = oSrc.blur;
fillOverlay = oSrc.fillOverlay;
glow = oSrc.glow;
innerShdw = oSrc.innerShdw;
outerShdw = oSrc.outerShdw;
prstShdw = oSrc.prstShdw;
reflection = oSrc.reflection;
softEdge = oSrc.softEdge;
return *this;
}
EffectLst& operator=(const EffectLst& oSrc);
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
blur = node.ReadNode(_T("a:blur"));
fillOverlay = node.ReadNode(_T("a:fillOverlay"));
glow = node.ReadNode(_T("a:glow"));
innerShdw = node.ReadNode(_T("a:innerShdw"));
outerShdw = node.ReadNode(_T("a:outerShdw"));
prstShdw = node.ReadNode(_T("a:prstShdw"));
reflection = node.ReadNode(_T("a:reflection"));
softEdge = node.ReadNode(_T("a:softEdge"));
virtual void fromXML(XmlUtils::CXmlNode& node);
FillParentPointersForChilds();
}
virtual CString toXML() const
{
CString str = _T("<a:effectLst>");
if (blur.IsInit()) str += blur->toXML();
if (fillOverlay.IsInit()) str += fillOverlay->toXML();
if (glow.IsInit()) str += glow->toXML();
if (innerShdw.IsInit()) str += innerShdw->toXML();
if (outerShdw.IsInit()) str += outerShdw->toXML();
if (prstShdw.IsInit()) str += prstShdw->toXML();
if (reflection.IsInit()) str += reflection->toXML();
if (softEdge.IsInit()) str += softEdge->toXML();
str += _T("</a:effectLst>");
return str;
}
virtual CString toXML() const;
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
{
......@@ -97,25 +56,8 @@ namespace PPTX
nullable<Reflection> reflection;
nullable<SoftEdge> softEdge;
protected:
virtual void FillParentPointersForChilds()
{
if(blur.IsInit())
blur->SetParentPointer(this);
if(fillOverlay.IsInit())
fillOverlay->SetParentPointer(this);
if(glow.IsInit())
glow->SetParentPointer(this);
if(innerShdw.IsInit())
innerShdw->SetParentPointer(this);
if(outerShdw.IsInit())
outerShdw->SetParentPointer(this);
if(prstShdw.IsInit())
prstShdw->SetParentPointer(this);
if(reflection.IsInit())
reflection->SetParentPointer(this);
if(softEdge.IsInit())
softEdge->SetParentPointer(this);
}
virtual void FillParentPointersForChilds();
};
} // namespace Logic
} // namespace PPTX
......
ASCOfficePPTXFile/PPTXFormat/Logic/EffectProperties.cpp
View file @ 0f95e918
......@@ -6,31 +6,7 @@ namespace PPTX
{
namespace Logic
{
EffectProperties::EffectProperties()
{
}
EffectProperties::~EffectProperties()
{
}
EffectProperties::EffectProperties(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const EffectProperties& EffectProperties::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
} // namespace Logic
} // namespace PPTX
\ No newline at end of file
} // namespace PPTX
ASCOfficePPTXFile/PPTXFormat/Logic/EffectStyle.cpp
View file @ 0f95e918
......@@ -5,29 +5,6 @@ namespace PPTX
namespace Logic
{
EffectStyle::EffectStyle()
{
}
EffectStyle::~EffectStyle()
{
}
EffectStyle::EffectStyle(XmlUtils::CXmlNode& node)
{
fromXML(node);
}
const EffectStyle& EffectStyle::operator =(XmlUtils::CXmlNode& node)
{
fromXML(node);
return *this;
}
void EffectStyle::fromXML(XmlUtils::CXmlNode& node)
{
EffectList.GetEffectListFrom(node);
......@@ -58,4 +35,4 @@ namespace PPTX
}
} // namespace Logic
} // namespace PPTX
\ No newline at end of file
} // namespace PPTX
ASCOfficePPTXFile/PPTXFormat/Logic/EffectStyle.h
View file @ 0f95e918
......@@ -29,24 +29,9 @@ namespace PPTX
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
EffectList.GetEffectListFrom(node);
scene3d = node.ReadNode(_T("a:scene3d"));
sp3d = node.ReadNode(_T("a:sp3d"));
FillParentPointersForChilds();
}
virtual CString toXML() const
{
XmlUtils::CNodeValue oValue;
oValue.Write(EffectList);
oValue.WriteNullable(scene3d);
oValue.WriteNullable(sp3d);
virtual void fromXML(XmlUtils::CXmlNode& node);
return XmlUtils::CreateNode(_T("a:effectStyle"), oValue);
}
virtual CString toXML() const;
virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
{
......@@ -65,16 +50,9 @@ namespace PPTX
nullable<Scene3d> scene3d;
nullable<Sp3d> sp3d;
protected:
virtual void FillParentPointersForChilds()
{
EffectList.SetParentPointer(this);
if(scene3d.IsInit())
scene3d->SetParentPointer(this);
if(sp3d.IsInit())
sp3d->SetParentPointer(this);
}
virtual void FillParentPointersForChilds();
};
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_EFFECTSTYLE_INCLUDE_H_
\ No newline at end of file
#endif // PPTX_LOGIC_EFFECTSTYLE_INCLUDE_H_
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