Commit 0f3a02ca authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent 62d48608
...@@ -37,10 +37,14 @@ ...@@ -37,10 +37,14 @@
namespace OOX namespace OOX
{ {
#define WritingElement_AdditionConstructors(Class) \ #define WritingElement_AdditionConstructors(Class) \
Class(XmlUtils::CXmlNode& oNode)\ explicit Class(XmlUtils::CXmlNode& oNode)\
{\ {\
fromXML( oNode );\ fromXML( oNode );\
}\ }\
explicit Class(const XmlUtils::CXmlNode& node)\
{\
fromXML(const_cast<XmlUtils::CXmlNode&> (node));\
}\
Class(XmlUtils::CXmlLiteReader& oReader)\ Class(XmlUtils::CXmlLiteReader& oReader)\
{\ {\
fromXML( oReader );\ fromXML( oReader );\
...@@ -54,7 +58,12 @@ namespace OOX ...@@ -54,7 +58,12 @@ namespace OOX
{\ {\
fromXML( (XmlUtils::CXmlLiteReader&)oReader );\ fromXML( (XmlUtils::CXmlLiteReader&)oReader );\
return *this;\ return *this;\
} }\
const Class& operator =(XmlUtils::CXmlNode& node) \
{ \
fromXML(node); \
return *this; \
} \
#define WritingElement_ReadNode( oRootNode, oChildNode, sNodeName, oValue ) \ #define WritingElement_ReadNode( oRootNode, oChildNode, sNodeName, oValue ) \
if ( oRootNode.GetNode( sNodeName, oChildNode ) )\ if ( oRootNode.GetNode( sNodeName, oChildNode ) )\
...@@ -350,6 +359,10 @@ namespace OOX ...@@ -350,6 +359,10 @@ namespace OOX
et_p_br, et_p_br,
et_p_MathPara, et_p_MathPara,
et_a_textFit,
et_a_hyperlink,
et_a_fld,
et_a_p, // <a:p> et_a_p, // <a:p>
et_a_pPr, // <a:pPr> et_a_pPr, // <a:pPr>
et_a_r, // <a:p> et_a_r, // <a:p>
...@@ -361,11 +374,21 @@ namespace OOX ...@@ -361,11 +374,21 @@ namespace OOX
et_a_spcAft, // <a:spcAft> et_a_spcAft, // <a:spcAft>
et_a_spcBef, // <a:spcBef> et_a_spcBef, // <a:spcBef>
et_a_lnSpc, // <a:lnSpc> et_a_lnSpc, // <a:lnSpc>
et_a_tab,
et_a_rtl,
et_a_buNone,
et_a_buChar, et_a_buChar,
et_a_buAutoNum, et_a_buAutoNum,
et_a_buClr,
et_a_buClrTx,
et_a_buFontTx,
et_a_buBlip,
et_a_buSzPct,
et_a_buSzPts,
et_a_buSzTx,
et_ds_schemaRef, // <ds:shemeRef> et_ds_schemaRef, // <ds:shemeRef>
et_ds_schemaRefs, // <ds:schemaRefs>
et_m_acc, //m:acc et_m_acc, //m:acc
et_m_accPr, //m:accPr et_m_accPr, //m:accPr
......
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