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

Merge remote-tracking branch 'origin/fix/coderefact' into develop

Browse Source
This commit is contained in:
Elena Subbotina
2022-12-26 15:43:26 +03:00
parent 975a2409ab 6e14576097
commit 5c46c77beb
674 changed files with 13810 additions and 23142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OOXML/PPTXFormat/Logic/AhBase.cpp
View File

@ -47,9 +47,9 @@ namespace PPTX
std::wstring name = XmlUtils::GetNameNoNS(node.GetName());
if (name == _T("ahXY"))
ah.reset(new Logic::AhXY(node));
ah.reset(CreatePtrXmlContent<Logic::AhXY>(node));
else if (name == _T("ahPolar"))
ah.reset(new Logic::AhPolar(node));
ah.reset(CreatePtrXmlContent<Logic::AhPolar>(node));
else ah.reset();
}
void AhBase::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -57,18 +57,18 @@ namespace PPTX
std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName());
if (sName == L"ahXY")
ah.reset(new Logic::AhXY(oReader));
ah.reset(CreatePtrXmlContent<Logic::AhXY>(oReader));
else if(sName == L"ahPolar")
ah.reset(new Logic::AhPolar(oReader));
ah.reset(CreatePtrXmlContent<Logic::AhPolar>(oReader));
else ah.reset();
}
void AhBase::GetAdjustHandleFrom(XmlUtils::CXmlNode& element)
{
XmlUtils::CXmlNode oNode;
if (element.GetNode(_T("a:ahXY"), oNode))
ah.reset(new Logic::AhXY(oNode));
ah.reset(CreatePtrXmlContent<Logic::AhXY>(oNode));
else if(element.GetNode(_T("a:ahPolar"), oNode))
ah.reset(new Logic::AhPolar(oNode));
ah.reset(CreatePtrXmlContent<Logic::AhPolar>(oNode));
else ah.reset();
}
std::wstring AhBase::toXML() const

2
OOXML/PPTXFormat/Logic/AhBase.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class AhBase : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AhBase)
WritingElement_AdditionMethods(AhBase)
PPTX_LOGIC_BASE2(AhBase)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/AhPolar.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class AhPolar : public Ah
{
public:
WritingElement_AdditionConstructors(AhPolar)
WritingElement_AdditionMethods(AhPolar)
PPTX_LOGIC_BASE2(AhPolar)
virtual void fromXML(XmlUtils::CXmlNode& node);

2
OOXML/PPTXFormat/Logic/AhXY.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class AhXY : public Ah
{
public:
WritingElement_AdditionConstructors(AhXY)
WritingElement_AdditionMethods(AhXY)
PPTX_LOGIC_BASE2(AhXY)
virtual void fromXML(XmlUtils::CXmlNode& node);

2
OOXML/PPTXFormat/Logic/Backdrop.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class Backdrop : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Backdrop)
WritingElement_AdditionMethods(Backdrop)
PPTX_LOGIC_BASE2(Backdrop)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Bevel.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class Bevel : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Bevel)
WritingElement_AdditionMethods(Bevel)
Bevel(const std::wstring name = L"a:bevel");
virtual ~Bevel();

4
OOXML/PPTXFormat/Logic/BodyPr.h
View File

@ -50,7 +50,7 @@ namespace PPTX
class BodyPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BodyPr)
WritingElement_AdditionMethods(BodyPr)
BodyPr(std::wstring ns = L"a");
@ -104,7 +104,7 @@ namespace PPTX
class LinkedTxbx : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(LinkedTxbx)
WritingElement_AdditionMethods(LinkedTxbx)
LinkedTxbx(std::wstring ns = L"a");

2
OOXML/PPTXFormat/Logic/Bullets/BuAutoNum.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class BuAutoNum : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuAutoNum)
WritingElement_AdditionMethods(BuAutoNum)
PPTX_LOGIC_BASE2(BuAutoNum)
BuAutoNum& operator=(const BuAutoNum& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuBlip.h
View File

@ -41,7 +41,7 @@ namespace PPTX
class BuBlip : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuBlip)
WritingElement_AdditionMethods(BuBlip)
PPTX_LOGIC_BASE2(BuBlip)
BuBlip& operator=(const BuBlip& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuChar.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuChar : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuChar)
WritingElement_AdditionMethods(BuChar)
PPTX_LOGIC_BASE2(BuChar)
BuChar& operator=(const BuChar& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuClr.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class BuClr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuClr)
WritingElement_AdditionMethods(BuClr)
PPTX_LOGIC_BASE2(BuClr)
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);

2
OOXML/PPTXFormat/Logic/Bullets/BuClrTx.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuClrTx : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuClrTx)
WritingElement_AdditionMethods(BuClrTx)
PPTX_LOGIC_BASE2(BuClrTx)
BuClrTx& operator=(const BuClrTx& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuFontTx.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuFontTx : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuFontTx)
WritingElement_AdditionMethods(BuFontTx)
PPTX_LOGIC_BASE2(BuFontTx)
BuFontTx& operator=(const BuFontTx& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuNone.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuNone : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuNone)
WritingElement_AdditionMethods(BuNone)
PPTX_LOGIC_BASE2(BuNone)
BuNone& operator=(const BuNone& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuSzPct.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuSzPct : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuSzPct)
WritingElement_AdditionMethods(BuSzPct)
PPTX_LOGIC_BASE2(BuSzPct)
BuSzPct& operator=(const BuSzPct& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuSzPts.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuSzPts : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuSzPts)
WritingElement_AdditionMethods(BuSzPts)
PPTX_LOGIC_BASE2(BuSzPts)
BuSzPts& operator=(const BuSzPts& oSrc);

2
OOXML/PPTXFormat/Logic/Bullets/BuSzTx.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class BuSzTx : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BuSzTx)
WritingElement_AdditionMethods(BuSzTx)
PPTX_LOGIC_BASE2(BuSzTx)
BuSzTx& operator=(const BuSzTx& oSrc);

24
OOXML/PPTXFormat/Logic/Bullets/Bullet.cpp
View File

@ -56,13 +56,13 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
if (strName == _T("buNone"))
m_Bullet.reset(new Logic::BuNone(oReader));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuNone>(oReader));
else if (strName == _T("buChar"))
m_Bullet.reset(new Logic::BuChar(oReader));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuChar>(oReader));
else if (strName == _T("buAutoNum"))
m_Bullet.reset(new Logic::BuAutoNum(oReader));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuAutoNum>(oReader));
else if (strName == _T("buBlip"))
m_Bullet.reset(new Logic::BuBlip(oReader));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuBlip>(oReader));
else
m_Bullet.reset();
}
@ -71,13 +71,13 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(node.GetName());
if (strName == _T("buNone"))
m_Bullet.reset(new Logic::BuNone(node));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuNone>(node));
else if (strName == _T("buChar"))
m_Bullet.reset(new Logic::BuChar(node));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuChar>(node));
else if (strName == _T("buAutoNum"))
m_Bullet.reset(new Logic::BuAutoNum(node));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuAutoNum>(node));
else if (strName == _T("buBlip"))
m_Bullet.reset(new Logic::BuBlip(node));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuBlip>(node));
else
m_Bullet.reset();
}
@ -85,13 +85,13 @@ namespace PPTX
{
XmlUtils::CXmlNode oNode;
if (element.GetNode(_T("a:buNone"), oNode))
m_Bullet.reset(new Logic::BuNone(oNode));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuNone>(oNode));
else if (element.GetNode(_T("a:buChar"), oNode))
m_Bullet.reset(new Logic::BuChar(oNode));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuChar>(oNode));
else if (element.GetNode(_T("a:buAutoNum"), oNode))
m_Bullet.reset(new Logic::BuAutoNum(oNode));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuAutoNum>(oNode));
else if (element.GetNode(_T("a:buBlip"), oNode))
m_Bullet.reset(new Logic::BuBlip(oNode));
m_Bullet.reset(CreatePtrXmlContent<Logic::BuBlip>(oNode));
else
m_Bullet.reset();
}

2
OOXML/PPTXFormat/Logic/Bullets/Bullet.h
View File

@ -46,7 +46,7 @@ namespace PPTX
class Bullet : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Bullet)
WritingElement_AdditionMethods(Bullet)
PPTX_LOGIC_BASE2(Bullet)
Bullet& operator=(const Bullet& oSrc);

12
OOXML/PPTXFormat/Logic/Bullets/BulletColor.cpp
View File

@ -56,9 +56,9 @@ namespace PPTX
std::wstring strName = oReader.GetName();
if (strName == _T("a:buClrTx"))
m_Color.reset(new Logic::BuClrTx(oReader));
m_Color.reset(CreatePtrXmlContent<Logic::BuClrTx>(oReader));
else if (strName == _T("a:buClr"))
m_Color.reset(new Logic::BuClr(oReader));
m_Color.reset(CreatePtrXmlContent<Logic::BuClr>(oReader));
else
m_Color.reset();
}
@ -67,9 +67,9 @@ namespace PPTX
std::wstring strName = node.GetName();
if (strName == _T("a:buClrTx"))
m_Color.reset(new Logic::BuClrTx(node));
m_Color.reset(CreatePtrXmlContent<Logic::BuClrTx>(node));
else if (strName == _T("a:buClr"))
m_Color.reset(new Logic::BuClr(node));
m_Color.reset(CreatePtrXmlContent<Logic::BuClr>(node));
else
m_Color.reset();
}
@ -77,9 +77,9 @@ namespace PPTX
{
XmlUtils::CXmlNode oNode;
if (element.GetNode(_T("a:buClrTx"), oNode))
m_Color.reset(new Logic::BuClrTx(oNode));
m_Color.reset(CreatePtrXmlContent<Logic::BuClrTx>(oNode));
else if (element.GetNode(_T("a:buClr"), oNode))
m_Color.reset(new Logic::BuClr(oNode));
m_Color.reset(CreatePtrXmlContent<Logic::BuClr>(oNode));
else
m_Color.reset();
}

2
OOXML/PPTXFormat/Logic/Bullets/BulletColor.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class BulletColor : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BulletColor)
WritingElement_AdditionMethods(BulletColor)
PPTX_LOGIC_BASE2(BulletColor)
BulletColor& operator=(const BulletColor& oColor);

18
OOXML/PPTXFormat/Logic/Bullets/BulletSize.cpp
View File

@ -56,11 +56,11 @@ namespace PPTX
std::wstring strName = oReader.GetName();
if (strName == _T("a:buSzTx"))
m_Size.reset(new Logic::BuSzTx(oReader));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzTx>(oReader));
else if (strName == _T("a:buSzPct"))
m_Size.reset(new Logic::BuSzPct(oReader));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPct>(oReader));
else if (strName == _T("a:buSzPts"))
m_Size.reset(new Logic::BuSzPts(oReader));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPts>(oReader));
else
m_Size.reset();
}
@ -69,11 +69,11 @@ namespace PPTX
std::wstring strName = node.GetName();
if (strName == _T("a:buSzTx"))
m_Size.reset(new Logic::BuSzTx(node));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzTx>(node));
else if (strName == _T("a:buSzPct"))
m_Size.reset(new Logic::BuSzPct(node));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPct>(node));
else if (strName == _T("a:buSzPts"))
m_Size.reset(new Logic::BuSzPts(node));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPts>(node));
else
m_Size.reset();
}
@ -81,11 +81,11 @@ namespace PPTX
{
XmlUtils::CXmlNode oNode;
if(element.GetNode(_T("a:buSzTx"), oNode))
m_Size.reset(new Logic::BuSzTx(oNode));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzTx>(oNode));
else if(element.GetNode(_T("a:buSzPct"), oNode))
m_Size.reset(new Logic::BuSzPct(oNode));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPct>(oNode));
else if(element.GetNode(_T("a:buSzPts"), oNode))
m_Size.reset(new Logic::BuSzPts(oNode));
m_Size.reset(CreatePtrXmlContent<Logic::BuSzPts>(oNode));
else
m_Size.reset();
}

2
OOXML/PPTXFormat/Logic/Bullets/BulletSize.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class BulletSize : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BulletSize)
WritingElement_AdditionMethods(BulletSize)
PPTX_LOGIC_BASE2(BulletSize)
BulletSize& operator=(const BulletSize& oSrc);

12
OOXML/PPTXFormat/Logic/Bullets/BulletTypeface.cpp
View File

@ -55,9 +55,9 @@ namespace PPTX
{
std::wstring strName = oReader.GetName();
if (strName == _T("a:buFontTx"))
m_Typeface.reset(new Logic::BuFontTx(oReader));
m_Typeface.reset(CreatePtrXmlContent<Logic::BuFontTx>(oReader));
else if (strName == _T("a:buFont"))
m_Typeface.reset(new Logic::TextFont(oReader));
m_Typeface.reset(CreatePtrXmlContent<Logic::TextFont>(oReader));
else
m_Typeface.reset();
}
@ -66,9 +66,9 @@ namespace PPTX
std::wstring strName = node.GetName();
if (strName == _T("a:buFontTx"))
m_Typeface.reset(new Logic::BuFontTx(node));
m_Typeface.reset(CreatePtrXmlContent<Logic::BuFontTx>(node));
else if (strName == _T("a:buFont"))
m_Typeface.reset(new Logic::TextFont(node));
m_Typeface.reset(CreatePtrXmlContent<Logic::TextFont>(node));
else
m_Typeface.reset();
}
@ -76,9 +76,9 @@ namespace PPTX
{
XmlUtils::CXmlNode oNode;
if (element.GetNode(_T("a:buFontTx"), oNode))
m_Typeface.reset(new Logic::BuFontTx(oNode));
m_Typeface.reset(CreatePtrXmlContent<Logic::BuFontTx>(oNode));
else if(element.GetNode(_T("a:buFont"), oNode))
m_Typeface.reset(new Logic::TextFont(oNode));
m_Typeface.reset(CreatePtrXmlContent<Logic::TextFont>(oNode));
else m_Typeface.reset();
}
bool BulletTypeface::is_init()const{return (m_Typeface.IsInit());};

2
OOXML/PPTXFormat/Logic/Bullets/BulletTypeface.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class BulletTypeface : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BulletTypeface)
WritingElement_AdditionMethods(BulletTypeface)
PPTX_LOGIC_BASE2(BulletTypeface)
BulletTypeface& operator=(const BulletTypeface& oSrc);

2
OOXML/PPTXFormat/Logic/CNvCxnSpPr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class CNvCxnSpPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CNvCxnSpPr)
WritingElement_AdditionMethods(CNvCxnSpPr)
CNvCxnSpPr(std::wstring ns = L"p");
CNvCxnSpPr& operator=(const CNvCxnSpPr& oSrc);

2
OOXML/PPTXFormat/Logic/CNvGraphicFramePr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class CNvGraphicFramePr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CNvGraphicFramePr)
WritingElement_AdditionMethods(CNvGraphicFramePr)
CNvGraphicFramePr(std::wstring ns = L"p");
CNvGraphicFramePr& operator=(const CNvGraphicFramePr& oSrc);

2
OOXML/PPTXFormat/Logic/CNvGrpSpPr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class CNvGrpSpPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CNvGrpSpPr)
WritingElement_AdditionMethods(CNvGrpSpPr)
CNvGrpSpPr(std::wstring ns = L"p")
{

2
OOXML/PPTXFormat/Logic/CNvPicPr.h
View File

@ -44,7 +44,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(CNvPicPr)
WritingElement_AdditionMethods(CNvPicPr)
CNvPicPr(std::wstring ns = L"p");
CNvPicPr& operator=(const CNvPicPr& oSrc);

2
OOXML/PPTXFormat/Logic/CNvPr.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class CNvPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CNvPr)
WritingElement_AdditionMethods(CNvPr)
CNvPr(std::wstring ns = L"p");

2
OOXML/PPTXFormat/Logic/CNvSpPr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class CNvSpPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CNvSpPr)
WritingElement_AdditionMethods(CNvSpPr)
CNvSpPr(std::wstring ns = L"p");
CNvSpPr& operator=(const CNvSpPr& oSrc);

2
OOXML/PPTXFormat/Logic/CSld.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class CSld : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CSld)
WritingElement_AdditionMethods(CSld)
CSld(OOX::Document *pMain = NULL);

2
OOXML/PPTXFormat/Logic/Camera.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class Camera : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Camera)
WritingElement_AdditionMethods(Camera)
PPTX_LOGIC_BASE2(Camera)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Cell3D.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class Cell3D : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Cell3D)
WritingElement_AdditionMethods(Cell3D)
Cell3D();

2
OOXML/PPTXFormat/Logic/ClrMap.h
View File

@ -41,7 +41,7 @@ namespace PPTX
class ClrMap : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(ClrMap)
WritingElement_AdditionMethods(ClrMap)
ClrMap(std::wstring name = L"p:clrMap");

2
OOXML/PPTXFormat/Logic/ClrMapOvr.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class ClrMapOvr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(ClrMapOvr)
WritingElement_AdditionMethods(ClrMapOvr)
PPTX_LOGIC_BASE2(ClrMapOvr)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Colors/ColorModifier.h
View File

@ -39,7 +39,7 @@ namespace PPTX
class ColorModifier : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(ColorModifier)
WritingElement_AdditionMethods(ColorModifier)
PPTX_LOGIC_BASE2(ColorModifier)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Colors/PrstClr.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class PrstClr : public ColorBase
{
public:
WritingElement_AdditionConstructors(PrstClr)
WritingElement_AdditionMethods(PrstClr)
PPTX_LOGIC_BASE2(PrstClr)
virtual OOX::EElementType getType() const;

4
OOXML/PPTXFormat/Logic/Colors/SchemeClr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class SchemeClr : public ColorBase
{
public:
WritingElement_AdditionConstructors(SchemeClr)
WritingElement_AdditionMethods(SchemeClr)
PPTX_LOGIC_BASE2(SchemeClr)
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
@ -76,7 +76,7 @@ namespace PPTX
class StyleClr : public ColorBase
{
public:
WritingElement_AdditionConstructors(StyleClr)
WritingElement_AdditionMethods(StyleClr)
PPTX_LOGIC_BASE2(StyleClr)
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);

2
OOXML/PPTXFormat/Logic/Colors/SrgbClr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class SrgbClr : public ColorBase
{
public:
WritingElement_AdditionConstructors(SrgbClr)
WritingElement_AdditionMethods(SrgbClr)
PPTX_LOGIC_BASE2(SrgbClr)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Colors/SysClr.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class SysClr : public ColorBase
{
public:
WritingElement_AdditionConstructors(SysClr)
WritingElement_AdditionMethods(SysClr)
PPTX_LOGIC_BASE2(SysClr)
virtual DWORD GetRGBA(DWORD RGBA) const;

12
OOXML/PPTXFormat/Logic/Controls.cpp
View File

@ -56,7 +56,9 @@ namespace PPTX
if (strName == L"control")
{
Control elem(oNode);
Control elem;
elem = oNode;
arrControls.push_back(elem);
}
else if (L"AlternateContent" == strName)
@ -80,12 +82,16 @@ namespace PPTX
XmlUtils::CXmlNode oNodeChoiceControl;
if (oNodeChoice.GetNode(L"p:control", oNodeChoiceControl))
{
Control elem(oNodeChoiceControl);
Control elem;
elem = oNodeChoiceControl;
arrControls.push_back(elem);
continue;
}
}
Control elem(oNodeFallbackControl);
Control elem;
elem = oNodeFallbackControl;
arrControls.push_back(elem);
}
}

4
OOXML/PPTXFormat/Logic/Controls.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class Control : public WrapperWritingElement
{
public:
PPTX_LOGIC_BASE(Control)
PPTX_LOGIC_BASE_NC(Control)
Control(OOX::Document *pMain = NULL) : WrapperWritingElement(pMain)
{
}
@ -79,7 +79,7 @@ namespace PPTX
class Controls : public WrapperWritingElement
{
public:
PPTX_LOGIC_BASE(Controls)
PPTX_LOGIC_BASE_NC(Controls)
Controls(OOX::Document *pMain = NULL) : WrapperWritingElement(pMain)
{

2
OOXML/PPTXFormat/Logic/CustGeom.h
View File

@ -47,7 +47,7 @@ namespace PPTX
class CustGeom : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(CustGeom)
WritingElement_AdditionMethods(CustGeom)
PPTX_LOGIC_BASE2(CustGeom)
CustGeom& operator=(const CustGeom& oSrc);

2
OOXML/PPTXFormat/Logic/Cxn.h
View File

@ -40,7 +40,7 @@ namespace PPTX
class Cxn : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Cxn)
WritingElement_AdditionMethods(Cxn)
PPTX_LOGIC_BASE2(Cxn)
Cxn& operator=(const Cxn& oSrc);

2
OOXML/PPTXFormat/Logic/DefaultShapeDefinition.h
View File

@ -46,7 +46,7 @@ namespace PPTX
class DefaultShapeDefinition : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(DefaultShapeDefinition)
WritingElement_AdditionMethods(DefaultShapeDefinition)
DefaultShapeDefinition();
DefaultShapeDefinition& operator=(const DefaultShapeDefinition& oSrc);

2
OOXML/PPTXFormat/Logic/EffectDag.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class EffectDag : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(EffectDag)
WritingElement_AdditionMethods(EffectDag)
PPTX_LOGIC_BASE2(EffectDag)
EffectDag& operator=(const EffectDag& oSrc)

2
OOXML/PPTXFormat/Logic/EffectLst.h
View File

@ -50,7 +50,7 @@ namespace PPTX
class EffectLst : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(EffectLst)
WritingElement_AdditionMethods(EffectLst)
PPTX_LOGIC_BASE2(EffectLst)
EffectLst& operator=(const EffectLst& oSrc);

36
OOXML/PPTXFormat/Logic/EffectProperties.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class EffectProperties : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(EffectProperties)
WritingElement_AdditionMethods(EffectProperties)
PPTX_LOGIC_BASE2(EffectProperties)
EffectProperties& operator=(const EffectProperties& oSrc)
@ -66,9 +66,17 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
if (strName == _T("effectLst"))
List.reset(new Logic::EffectLst(oReader));
{
Logic::EffectLst* pEffectLst = new Logic::EffectLst();
*pEffectLst = oReader;
List.reset(pEffectLst);
}
else if(strName == _T("effectDag"))
List.reset(new Logic::EffectDag(oReader));
{
Logic::EffectDag* pEffectDag = new Logic::EffectDag();
*pEffectDag = oReader;
List.reset(pEffectDag);
}
else
List.reset();
}
@ -84,9 +92,17 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(node.GetName());
if (strName == _T("effectLst"))
List.reset(new Logic::EffectLst(node));
{
Logic::EffectLst* pEffectLst = new Logic::EffectLst();
*pEffectLst = node;
List.reset(pEffectLst);
}
else if(strName == _T("effectDag"))
List.reset(new Logic::EffectDag(node));
{
Logic::EffectDag* pEffectDag = new Logic::EffectDag();
*pEffectDag = node;
List.reset(pEffectDag);
}
else List.reset();
}
@ -95,12 +111,18 @@ namespace PPTX
XmlUtils::CXmlNode oNode = element.ReadNodeNoNS(_T("effectLst"));
if (oNode.IsValid())
{
List.reset(new Logic::EffectLst(oNode));
Logic::EffectLst* pEffectLst = new Logic::EffectLst();
*pEffectLst = oNode;
List.reset(pEffectLst);
return;
}
oNode = element.ReadNodeNoNS(_T("effectDag"));
if (oNode.IsValid())
List.reset(new Logic::EffectDag(oNode));
{
Logic::EffectDag* pEffectDag = new Logic::EffectDag();
*pEffectDag = oNode;
List.reset(pEffectDag);
}
else List.reset();
}

2
OOXML/PPTXFormat/Logic/EffectStyle.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class EffectStyle : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(EffectStyle)
WritingElement_AdditionMethods(EffectStyle)
PPTX_LOGIC_BASE2(EffectStyle)
EffectStyle& operator=(const EffectStyle& oSrc)

2
OOXML/PPTXFormat/Logic/Effects/AlphaBiLevel.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class AlphaBiLevel : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaBiLevel)
WritingElement_AdditionMethods(AlphaBiLevel)
PPTX_LOGIC_BASE2(AlphaBiLevel)
AlphaBiLevel& operator=(const AlphaBiLevel& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaCeiling.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class AlphaCeiling : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaCeiling)
WritingElement_AdditionMethods(AlphaCeiling)
PPTX_LOGIC_BASE2(AlphaCeiling)
AlphaCeiling& operator=(const AlphaCeiling& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaFloor.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class AlphaFloor : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaFloor)
WritingElement_AdditionMethods(AlphaFloor)
PPTX_LOGIC_BASE2(AlphaFloor)
AlphaFloor& operator=(const AlphaFloor& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaInv.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class AlphaInv : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaInv)
WritingElement_AdditionMethods(AlphaInv)
PPTX_LOGIC_BASE2(AlphaInv)
AlphaInv& operator=(const AlphaInv& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaMod.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class AlphaMod : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaMod)
WritingElement_AdditionMethods(AlphaMod)
PPTX_LOGIC_BASE2(AlphaMod)
AlphaMod& operator=(const AlphaMod& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaModFix.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class AlphaModFix : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaModFix)
WritingElement_AdditionMethods(AlphaModFix)
PPTX_LOGIC_BASE2(AlphaModFix)
AlphaModFix& operator=(const AlphaModFix& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaOutset.h
View File

@ -44,7 +44,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(AlphaOutset)
WritingElement_AdditionMethods(AlphaOutset)
PPTX_LOGIC_BASE2(AlphaOutset)
AlphaOutset& operator=(const AlphaOutset& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/AlphaRepl.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class AlphaRepl : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(AlphaRepl)
WritingElement_AdditionMethods(AlphaRepl)
PPTX_LOGIC_BASE2(AlphaRepl)
AlphaRepl& operator=(const AlphaRepl& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/BiLevel.h
View File

@ -43,7 +43,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(BiLevel)
WritingElement_AdditionMethods(BiLevel)
PPTX_LOGIC_BASE2(BiLevel)
BiLevel& operator=(const BiLevel& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Blend.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class Blend : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Blend)
WritingElement_AdditionMethods(Blend)
PPTX_LOGIC_BASE2(Blend)
Blend& operator=(const Blend& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Blur.h
View File

@ -43,7 +43,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(Blur)
WritingElement_AdditionMethods(Blur)
PPTX_LOGIC_BASE2(Blur)
Blur& operator=(const Blur& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/ClrChange.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class ClrChange : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(ClrChange)
WritingElement_AdditionMethods(ClrChange)
PPTX_LOGIC_BASE2(ClrChange)
ClrChange& operator=(const ClrChange& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/ClrRepl.h
View File

@ -45,7 +45,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(ClrRepl)
WritingElement_AdditionMethods(ClrRepl)
PPTX_LOGIC_BASE2(ClrRepl)
ClrRepl& operator=(const ClrRepl& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Duotone.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class Duotone : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Duotone)
WritingElement_AdditionMethods(Duotone)
PPTX_LOGIC_BASE2(Duotone)
Duotone& operator=(const Duotone& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/EffectElement.h
View File

@ -43,7 +43,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(EffectElement)
WritingElement_AdditionMethods(EffectElement)
PPTX_LOGIC_BASE2(EffectElement)
EffectElement& operator=(const EffectElement& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/FillEffect.h
View File

@ -44,7 +44,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(FillEffect)
WritingElement_AdditionMethods(FillEffect)
PPTX_LOGIC_BASE2(FillEffect)
FillEffect& operator=(const FillEffect& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/FillOverlay.h
View File

@ -45,7 +45,7 @@ namespace PPTX
{
public:
WritingElement_AdditionConstructors(FillOverlay)
WritingElement_AdditionMethods(FillOverlay)
PPTX_LOGIC_BASE2(FillOverlay)
FillOverlay& operator=(const FillOverlay& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Glow.h
View File

@ -41,7 +41,7 @@ namespace PPTX
class Glow : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Glow)
WritingElement_AdditionMethods(Glow)
PPTX_LOGIC_BASE2(Glow)
Glow& operator=(const Glow& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Grayscl.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class Grayscl : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Grayscl)
WritingElement_AdditionMethods(Grayscl)
PPTX_LOGIC_BASE2(Grayscl)
Grayscl& operator=(const Grayscl& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/HslEffect.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class HslEffect : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(HslEffect)
WritingElement_AdditionMethods(HslEffect)
PPTX_LOGIC_BASE2(HslEffect)
HslEffect& operator=(const HslEffect& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/InnerShdw.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class InnerShdw : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(InnerShdw)
WritingElement_AdditionMethods(InnerShdw)
PPTX_LOGIC_BASE2(InnerShdw)
InnerShdw& operator=(const InnerShdw& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/LumEffect.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class LumEffect : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(LumEffect)
WritingElement_AdditionMethods(LumEffect)
PPTX_LOGIC_BASE2(LumEffect)
LumEffect& operator=(const LumEffect& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/OuterShdw.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class OuterShdw : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(OuterShdw)
WritingElement_AdditionMethods(OuterShdw)
PPTX_LOGIC_BASE2(OuterShdw)
OuterShdw& operator=(const OuterShdw& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/PrstShdw.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class PrstShdw : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(PrstShdw)
WritingElement_AdditionMethods(PrstShdw)
PPTX_LOGIC_BASE2(PrstShdw)
PrstShdw& operator=(const PrstShdw& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/Reflection.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class Reflection : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Reflection)
WritingElement_AdditionMethods(Reflection)
PPTX_LOGIC_BASE2(Reflection)
Reflection& operator=(const Reflection& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/RelOff.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class RelOff : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(RelOff)
WritingElement_AdditionMethods(RelOff)
PPTX_LOGIC_BASE2(RelOff)
RelOff& operator=(const RelOff& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/SoftEdge.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class SoftEdge : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(SoftEdge)
WritingElement_AdditionMethods(SoftEdge)
PPTX_LOGIC_BASE2(SoftEdge)
SoftEdge& operator=(const SoftEdge& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/TintEffect.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class TintEffect : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(TintEffect)
WritingElement_AdditionMethods(TintEffect)
PPTX_LOGIC_BASE2(TintEffect)
TintEffect& operator=(const TintEffect& oSrc);

2
OOXML/PPTXFormat/Logic/Effects/XfrmEffect.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class XfrmEffect : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(XfrmEffect)
WritingElement_AdditionMethods(XfrmEffect)
PPTX_LOGIC_BASE2(XfrmEffect)
XfrmEffect& operator=(const XfrmEffect& oSrc);

2
OOXML/PPTXFormat/Logic/ExtP.h
View File

@ -99,7 +99,7 @@ namespace PPTX
class Ext : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Ext)
WritingElement_AdditionMethods(Ext)
Ext();

2
OOXML/PPTXFormat/Logic/Fills/Blip.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class Blip : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Blip)
WritingElement_AdditionMethods(Blip)
Blip(std::wstring ns = L"a");
Blip& operator=(const Blip& oSrc);

2
OOXML/PPTXFormat/Logic/Fills/BlipFill.h
View File

@ -47,7 +47,7 @@ namespace PPTX
class BlipFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(BlipFill)
WritingElement_AdditionMethods(BlipFill)
BlipFill(std::wstring ns = L"p");
BlipFill& operator=(const BlipFill& oSrc);

2
OOXML/PPTXFormat/Logic/Fills/GradFill.h
View File

@ -48,7 +48,7 @@ namespace PPTX
class GradFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(GradFill)
WritingElement_AdditionMethods(GradFill)
GradFill(std::wstring ns = L"a");

4
OOXML/PPTXFormat/Logic/Fills/NoFill.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class NoFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(NoFill)
WritingElement_AdditionMethods(NoFill)
NoFill(std::wstring ns = L"a");
@ -69,7 +69,7 @@ namespace PPTX
class GrpFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(GrpFill)
WritingElement_AdditionMethods(GrpFill)
PPTX_LOGIC_BASE2(GrpFill)
GrpFill& operator=(const GrpFill& oSrc);

2
OOXML/PPTXFormat/Logic/Fills/PattFill.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class PattFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(PattFill)
WritingElement_AdditionMethods(PattFill)
PattFill(std::wstring ns = L"a");

2
OOXML/PPTXFormat/Logic/Fills/SolidFill.h
View File

@ -43,7 +43,7 @@ namespace PPTX
class SolidFill : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(SolidFill)
WritingElement_AdditionMethods(SolidFill)
SolidFill(std::wstring ns = L"a");
SolidFill& operator=(const SolidFill& oSrc);

2
OOXML/PPTXFormat/Logic/Fills/Stretch.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class Stretch : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Stretch)
WritingElement_AdditionMethods(Stretch)
PPTX_LOGIC_BASE2(Stretch)
Stretch& operator=(const Stretch& oSrc);

2
OOXML/PPTXFormat/Logic/Fills/Tile.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class Tile : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Tile)
WritingElement_AdditionMethods(Tile)
PPTX_LOGIC_BASE2(Tile)
Tile& operator=(const Tile& oSrc);

6
OOXML/PPTXFormat/Logic/FontCollection.cpp
View File

@ -74,7 +74,11 @@ namespace PPTX
else if (_T("cs") == strName)
cs = oNode;
else if (_T("font") == strName)
Fonts.push_back(SupplementalFont(oNode));
{
SupplementalFont elem;
elem = oNode;
Fonts.push_back(elem);
}
}
}

2
OOXML/PPTXFormat/Logic/FontRef.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class FontRef : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(FontRef)
WritingElement_AdditionMethods(FontRef)
FontRef();

2
OOXML/PPTXFormat/Logic/Gd.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class Gd : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Gd)
WritingElement_AdditionMethods(Gd)
PPTX_LOGIC_BASE2(Gd)
virtual OOX::EElementType getType () const;

12
OOXML/PPTXFormat/Logic/Geometry.cpp
View File

@ -147,9 +147,9 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
if (strName == _T("prstGeom"))
m_geometry.reset(new Logic::PrstGeom(oReader));
m_geometry.reset(CreatePtrXmlContent<Logic::PrstGeom>(oReader));
else if (strName == _T("custGeom"))
m_geometry.reset(new Logic::CustGeom(oReader));
m_geometry.reset(CreatePtrXmlContent<Logic::CustGeom>(oReader));
else
m_geometry.reset();
}
@ -158,18 +158,18 @@ namespace PPTX
std::wstring strName = XmlUtils::GetNameNoNS(node.GetName());
if (strName == _T("prstGeom"))
m_geometry.reset(new Logic::PrstGeom(node));
m_geometry.reset(CreatePtrXmlContent<Logic::PrstGeom>(node));
else if (strName == _T("custGeom"))
m_geometry.reset(new Logic::CustGeom(node));
m_geometry.reset(CreatePtrXmlContent<Logic::CustGeom>(node));
else m_geometry.reset();
}
void Geometry::GetGeometryFrom(XmlUtils::CXmlNode& element)
{
XmlUtils::CXmlNode oNode;
if (element.GetNode(_T("a:prstGeom"), oNode))
m_geometry.reset(new Logic::PrstGeom(oNode));
m_geometry.reset(CreatePtrXmlContent<Logic::PrstGeom>(oNode));
else if (element.GetNode(_T("a:custGeom"), oNode))
m_geometry.reset(new Logic::CustGeom(oNode));
m_geometry.reset(CreatePtrXmlContent<Logic::CustGeom>(oNode));
else m_geometry.reset();
}
std::wstring Geometry::toXML() const

2
OOXML/PPTXFormat/Logic/Geometry.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class Geometry : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Geometry)
WritingElement_AdditionMethods(Geometry)
Geometry();

2
OOXML/PPTXFormat/Logic/GrpSpPr.h
View File

@ -49,7 +49,7 @@ namespace PPTX
class GrpSpPr : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(GrpSpPr)
WritingElement_AdditionMethods(GrpSpPr)
GrpSpPr(std::wstring ns = L"p");
GrpSpPr& operator=(const GrpSpPr& oSrc);

2
OOXML/PPTXFormat/Logic/Gs.h
View File

@ -41,7 +41,7 @@ namespace PPTX
class Gs : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Gs)
WritingElement_AdditionMethods(Gs)
PPTX_LOGIC_BASE2(Gs)
Gs& operator=(const Gs& oSrc);

2
OOXML/PPTXFormat/Logic/Hyperlink.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class Hyperlink : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Hyperlink)
WritingElement_AdditionMethods(Hyperlink)
Hyperlink(const std::wstring & name = L"hlinkClick");
virtual OOX::EElementType getType () const;

2
OOXML/PPTXFormat/Logic/LightRig.h
View File

@ -45,7 +45,7 @@ namespace PPTX
class LightRig : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(LightRig)
WritingElement_AdditionMethods(LightRig)
PPTX_LOGIC_BASE2(LightRig)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/Lin.h
View File

@ -42,7 +42,7 @@ namespace PPTX
class Lin : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(Lin)
WritingElement_AdditionMethods(Lin)
PPTX_LOGIC_BASE2(Lin)
virtual OOX::EElementType getType () const;

2
OOXML/PPTXFormat/Logic/LineEnd.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class LineEnd : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(LineEnd)
WritingElement_AdditionMethods(LineEnd)
PPTX_LOGIC_BASE2(LineEnd)
virtual OOX::EElementType getType() const;

2
OOXML/PPTXFormat/Logic/LineJoin.h
View File

@ -44,7 +44,7 @@ namespace PPTX
class LineJoin : public WrapperWritingElement
{
public:
WritingElement_AdditionConstructors(LineJoin)
WritingElement_AdditionMethods(LineJoin)
PPTX_LOGIC_BASE2(LineJoin)
virtual bool is_init() const;

Some files were not shown because too many files have changed in this diff Show More