diff --git a/ASCOfficeDocxFile2/BinReader/Readers.h b/ASCOfficeDocxFile2/BinReader/Readers.h
index 92e5d7407d..061c49948b 100644
--- a/ASCOfficeDocxFile2/BinReader/Readers.h
+++ b/ASCOfficeDocxFile2/BinReader/Readers.h
@@ -53,6 +53,8 @@
 #include "../../DesktopEditor/common/ASCVariant.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
+#include "../../DesktopEditor/common/Directory.h"
+
 namespace BinDocxRW {
 
 enum ETblStyleOverrideType
diff --git a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
index a81837bcef..5f19d13f5f 100644
--- a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
+++ b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
@@ -28,8 +28,6 @@ DEFINES +=  UNICODE \
 INCLUDEPATH += ../../ASCOfficeOdfFile/include
 INCLUDEPATH += ../../ASCOfficeOdfFile/src/odf/datatypes
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
-
 CONFIG(debug, debug|release){
 DEFINES +=  _DEBUG
 }
diff --git a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
index c430e17dcd..e96608d6b5 100644
--- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
@@ -1594,7 +1594,7 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
 	OOX::CDiagramData*		pDiagramData	= NULL;
 	OOX::CDiagramDrawing*	pDiagramDrawing	= NULL;
 
-	oNode.ReadAttributeBase(L"r:dm", id_data);
+    XmlMacroReadAttributeBase(oNode, L"r:dm", id_data);
 	
 	if (id_data.IsInit())
 	{
@@ -2051,7 +2051,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 					int R = 255,	G = 255,	B = 255;
 
 					nullable_string sFillColor;
-					oNodeShape.ReadAttributeBase(L"fillcolor", sFillColor);
+                    XmlMacroReadAttributeBase(oNodeShape, L"fillcolor", sFillColor);
 					if (sFillColor.is_init())
 					{
 						eFillType = etSolidFill;
@@ -2074,7 +2074,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 					{
 						// default color for vml = white
 						nullable_string sFilled;
-						oNodeShape.ReadAttributeBase(L"filled", sFilled);
+                        XmlMacroReadAttributeBase(oNodeShape, L"filled", sFilled);
 						if (!sFilled.is_init() || (*sFilled != L"false") && *sFilled != L"f")
 						{
 							eFillType = etSolidFill;
@@ -2139,21 +2139,21 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 							}
 
 							nullable_string sFitPath;
-							oNodeP.ReadAttributeBase(L"fitpath", sFitPath);
+                            XmlMacroReadAttributeBase(oNodeP, L"fitpath", sFitPath);
 							if (sFitPath.is_init() && (*sFitPath == L"true" || *sFitPath == L"t"))
 							{
 								bFitPath = true;
 							}
 
 							nullable_string sFitShape;
-							oNodeP.ReadAttributeBase(L"fitshape", sFitShape);
+                            XmlMacroReadAttributeBase(oNodeP, L"fitshape", sFitShape);
 							if (sFitShape.is_init() && (*sFitShape == L"true" || *sFitShape == L"t"))
 							{
 								bFitShape = true;
 							}
 
 							nullable_string sTrim;
-							oNodeP.ReadAttributeBase(L"trim", sTrim);
+                            XmlMacroReadAttributeBase(oNodeP, L"trim", sTrim);
 							if (sTrim.is_init() && (*sTrim == L"true" || *sTrim == L"t"))
 							{
 								bTrimTextPath = true;
@@ -2171,15 +2171,15 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 							nullable_string sAngle;
 							nullable_string sColors;
 
-							oNodeP.ReadAttributeBase(L"opacity"			, sOpacity);
-							oNodeP.ReadAttributeBase(L"opacity2"		, sOpacity2);
-							oNodeP.ReadAttributeBase(L"color2"			, sColor2);
-							oNodeP.ReadAttributeBase(L"type"			, sType);
-							oNodeP.ReadAttributeBase(L"focus"			, sFocus);
-							oNodeP.ReadAttributeBase(L"focussize"		, sFocusSize);
-							oNodeP.ReadAttributeBase(L"focusposition"	, sFocusPosition);
-							oNodeP.ReadAttributeBase(L"angle"			, sAngle);
-							oNodeP.ReadAttributeBase(L"colors"			, sColors);
+                            XmlMacroReadAttributeBase(oNodeP, L"opacity"			, sOpacity);
+                            XmlMacroReadAttributeBase(oNodeP, L"opacity2"		, sOpacity2);
+                            XmlMacroReadAttributeBase(oNodeP, L"color2"			, sColor2);
+                            XmlMacroReadAttributeBase(oNodeP, L"type"			, sType);
+                            XmlMacroReadAttributeBase(oNodeP, L"focus"			, sFocus);
+                            XmlMacroReadAttributeBase(oNodeP, L"focussize"		, sFocusSize);
+                            XmlMacroReadAttributeBase(oNodeP, L"focusposition"	, sFocusPosition);
+                            XmlMacroReadAttributeBase(oNodeP, L"angle"			, sAngle);
+                            XmlMacroReadAttributeBase(oNodeP, L"colors"			, sColors);
 
 							if (sType.is_init())
 							{
@@ -2350,9 +2350,9 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 					nullable_string sStrokeWeight;
 					nullable_string sStroked;				
 	               
-					oNodeShape.ReadAttributeBase(L"strokecolor",    sStrokeColor);
-					oNodeShape.ReadAttributeBase(L"strokeweight",   sStrokeWeight);
-					oNodeShape.ReadAttributeBase(L"stroked",        sStroked);
+                    XmlMacroReadAttributeBase(oNodeShape, L"strokecolor",    sStrokeColor);
+                    XmlMacroReadAttributeBase(oNodeShape, L"strokeweight",   sStrokeWeight);
+                    XmlMacroReadAttributeBase(oNodeShape, L"stroked",        sStroked);
 
 		//textFill
 					strRPr += L"<w14:textFill>";
@@ -3406,7 +3406,7 @@ std::wstring CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, P
     nullable_bool isAllowInCell;
     nullable_string sAllowInCell;
 
-    oNode.ReadAttributeBase(L"o:allowincell", sAllowInCell);
+    XmlMacroReadAttributeBase(oNode, L"o:allowincell", sAllowInCell);
     if (sAllowInCell.is_init())
     {
         if ((L"f" == *sAllowInCell) || (L"false"== *sAllowInCell))
@@ -3417,7 +3417,7 @@ std::wstring CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, P
 	nullable_bool isAllowOverlap;
     nullable_string sAllowOverlap;
 	
-	oNode.ReadAttributeBase(L"o:allowoverlap", sAllowOverlap);
+    XmlMacroReadAttributeBase(oNode, L"o:allowoverlap", sAllowOverlap);
 	if (sAllowOverlap.is_init())
     {
         if ((L"f" == *sAllowOverlap) || (L"false"== *sAllowOverlap))
@@ -3937,7 +3937,7 @@ void CDrawingConverter::CheckBorderShape(PPTX::Logic::SpTreeElem* oElem, XmlUtil
 		return; //дублирование обрамлением линией
 
 	nullable_string sColorBorder;
-	oNode.ReadAttributeBase(L"o:borderleftcolor", sColorBorder);
+    XmlMacroReadAttributeBase(oNode, L"o:borderleftcolor", sColorBorder);
 	
 	XmlUtils::CXmlNode oNodeBorder = oNode.ReadNode(L"w10:borderleft");
 
@@ -3945,10 +3945,10 @@ void CDrawingConverter::CheckBorderShape(PPTX::Logic::SpTreeElem* oElem, XmlUtil
 	{
 		pSpPr->ln.Init();
 		nullable_int nWidthBorder;
-		oNode.ReadAttributeBase(L"width", nWidthBorder);
+        XmlMacroReadAttributeBase(oNode, L"width", nWidthBorder);
 		
 		nullable_string sTypeBorder;
-		oNode.ReadAttributeBase(L"type", sTypeBorder);
+        XmlMacroReadAttributeBase(oNode, L"type", sTypeBorder);
 
 		if (sTypeBorder.IsInit())
 		{
@@ -4017,7 +4017,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
     int B = 255;
 
 	nullable_string sFillColor;
-	oNode.ReadAttributeBase(L"fillcolor", sFillColor);
+    XmlMacroReadAttributeBase(oNode, L"fillcolor", sFillColor);
 	if (sFillColor.is_init() && !pPPTShape->IsWordArt())
 	{
 		NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(*sFillColor);
@@ -4043,7 +4043,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
     }
 
 	nullable_string sFilled;
-	oNode.ReadAttributeBase(L"filled", sFilled);
+    XmlMacroReadAttributeBase(oNode, L"filled", sFilled);
 	if (sFilled.is_init())
 	{
         if (*sFilled == L"false" || *sFilled == L"f")
@@ -4065,7 +4065,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 	}
 
 	nullable_string sOpacity;
-    oNode.ReadAttributeBase(L"opacity", sOpacity);
+    XmlMacroReadAttributeBase(oNode, L"opacity", sOpacity);
 	if (sOpacity.is_init())
 	{
 		BYTE lAlpha = NS_DWC_Common::getOpacityFromString(*sOpacity);
@@ -4084,13 +4084,13 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 	if (oNodeFill.IsValid() && !pPPTShape->IsWordArt())
 	{
 		nullable_string sType;
-		oNodeFill.ReadAttributeBase(L"type", sType);
+        XmlMacroReadAttributeBase(oNodeFill, L"type", sType);
 
 		sOpacity.reset();
-        oNodeFill.ReadAttributeBase(L"opacity", sOpacity);
+        XmlMacroReadAttributeBase(oNodeFill, L"opacity", sOpacity);
 
 		nullable_string sColor;
-		oNodeFill.ReadAttributeBase(L"color", sColor);
+        XmlMacroReadAttributeBase(oNodeFill, L"color", sColor);
 		if (sColor.is_init())
 		{
 			NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(*sColor);
@@ -4109,7 +4109,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 		if (!sColor.is_init()) sColor = sFillColor;
 
 		nullable_string sRid;
-		oNodeFill.ReadAttributeBase(L"r:id", sRid);
+        XmlMacroReadAttributeBase(oNodeFill, L"r:id", sRid);
 		if (sRid.is_init())
 		{		
 			PPTX::Logic::BlipFill* pBlipFill = NULL;
@@ -4138,16 +4138,16 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 			}
 		}		
 		nullable_string sRotate;
-		oNodeFill.ReadAttributeBase(L"rotate", sRotate);
+        XmlMacroReadAttributeBase(oNodeFill, L"rotate", sRotate);
 
 		nullable_string sMethod;
-		oNodeFill.ReadAttributeBase(L"method", sMethod);
+        XmlMacroReadAttributeBase(oNodeFill, L"method", sMethod);
 		
 		nullable_string sColor2;
-		oNodeFill.ReadAttributeBase(L"color2", sColor2);
+        XmlMacroReadAttributeBase(oNodeFill, L"color2", sColor2);
 		
 		nullable_string sFocus;
-		oNodeFill.ReadAttributeBase(L"focus", sFocus);
+        XmlMacroReadAttributeBase(oNodeFill, L"focus", sFocus);
 		//
         if (sType.is_init() && (*sType == L"gradient" || *sType == L"gradientradial" || *sType == L"gradientRadial"))
 		{
@@ -4252,15 +4252,15 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 		if (oNodeFillID.IsValid())
 		{
 			nullable_string sRid;
-			oNodeFillID.ReadAttributeBase(L"r:id", sRid);
+            XmlMacroReadAttributeBase(oNodeFillID, L"r:id", sRid);
 			
 			nullable_string sRelid;
-			oNodeFillID.ReadAttributeBase(L"o:relid", sRelid);
+            XmlMacroReadAttributeBase(oNodeFillID, L"o:relid", sRelid);
 
 			if (sRid.is_init() || sRelid.is_init())
 			{			
 				nullable_string sType;
-				oNodeFillID.ReadAttributeBase(L"type", sType);
+                XmlMacroReadAttributeBase(oNodeFillID, L"type", sType);
 
 				PPTX::Logic::BlipFill* pBlipFill = NULL;
 				
@@ -4390,7 +4390,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 
 	// attributes
 	nullable_string sStrokeColor;
-	oNode.ReadAttributeBase(L"strokecolor", sStrokeColor);
+    XmlMacroReadAttributeBase(oNode, L"strokecolor", sStrokeColor);
 	if (sStrokeColor.is_init())
 	{
 		NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(*sStrokeColor);
@@ -4408,7 +4408,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 	}
 
 	nullable_string sStrokeWeight;
-	oNode.ReadAttributeBase(L"strokeweight", sStrokeWeight);
+    XmlMacroReadAttributeBase(oNode, L"strokeweight", sStrokeWeight);
 	if (sStrokeWeight.is_init())
 	{
 		if (!pSpPr->ln.is_init())
@@ -4427,7 +4427,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 	}
 
 	nullable_string sStroked;
-	oNode.ReadAttributeBase(L"stroked", sStroked);
+    XmlMacroReadAttributeBase(oNode, L"stroked", sStroked);
 	if (sStroked.is_init())
 	{
         if (*sStroked == L"false" || *sStroked == L"f")
@@ -4452,7 +4452,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 	if (oNodeStroke.IsValid())
 	{
 		sStrokeColor.reset();
-		oNodeStroke.ReadAttributeBase(L"strokecolor", sStrokeColor);
+        XmlMacroReadAttributeBase(oNodeStroke, L"strokecolor", sStrokeColor);
 		if (sStrokeColor.is_init())
 		{
 			NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(*sStrokeColor);
@@ -4470,7 +4470,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sStrokeDashStyle;
-		oNodeStroke.ReadAttributeBase(L"dashstyle", sStrokeDashStyle);
+        XmlMacroReadAttributeBase(oNodeStroke, L"dashstyle", sStrokeDashStyle);
 		if (sStrokeDashStyle.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4493,7 +4493,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sEndArraw;
-        oNodeStroke.ReadAttributeBase(L"endarrow", sEndArraw);
+        XmlMacroReadAttributeBase(oNodeStroke, L"endarrow", sEndArraw);
 		if (sEndArraw.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4511,7 +4511,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sEndArrawLen;
-        oNodeStroke.ReadAttributeBase(L"endarrowlength", sEndArrawLen);
+        XmlMacroReadAttributeBase(oNodeStroke, L"endarrowlength", sEndArrawLen);
 		if (sEndArrawLen.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4527,7 +4527,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sEndArrawWidth;
-        oNodeStroke.ReadAttributeBase(L"endarrowwidth", sEndArrawWidth);
+        XmlMacroReadAttributeBase(oNodeStroke, L"endarrowwidth", sEndArrawWidth);
 		if (sEndArrawWidth.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4543,7 +4543,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sStartArraw;
-        oNodeStroke.ReadAttributeBase(L"startarrow", sStartArraw);
+        XmlMacroReadAttributeBase(oNodeStroke, L"startarrow", sStartArraw);
 		if (sStartArraw.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4561,7 +4561,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sStartArrawLen;
-        oNodeStroke.ReadAttributeBase(L"startarrowlength", sStartArrawLen);
+        XmlMacroReadAttributeBase(oNodeStroke, L"startarrowlength", sStartArrawLen);
 		if (sStartArrawLen.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4577,7 +4577,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sStartArrawWidth;
-        oNodeStroke.ReadAttributeBase(L"startarrowwidth", sStartArrawWidth);
+        XmlMacroReadAttributeBase(oNodeStroke, L"startarrowwidth", sStartArrawWidth);
 		if (sStartArrawWidth.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4593,7 +4593,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sEndCap;
-        oNodeStroke.ReadAttributeBase(L"endcap", sEndCap);
+        XmlMacroReadAttributeBase(oNodeStroke, L"endcap", sEndCap);
 		if (sEndCap.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -4605,7 +4605,7 @@ void CDrawingConverter::CheckPenShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils::
 		}
 
 		nullable_string sLineJoin;
-        oNodeStroke.ReadAttributeBase(L"joinstyle", sLineJoin);
+        XmlMacroReadAttributeBase(oNodeStroke, L"joinstyle", sLineJoin);
 		if (sLineJoin.is_init())
 		{
 			if (!pSpPr->ln.is_init())
@@ -5004,7 +5004,7 @@ void CDrawingConverter::ConvertTextVML(XmlUtils::CXmlNode &nodeTextBox, PPTX::Lo
 							run->SetText(node1.GetText());
 							
 							std::vector<std::wstring > attNames, attValues;
-							node1.ReadAllAttributes(attNames,attValues);
+                            node1.GetAllAttributes(attNames,attValues);
 
 							if (attNames.size() > 0)
 							{
@@ -5062,10 +5062,10 @@ void CDrawingConverter::ConvertMainPropsToVML(const std::wstring& bsMainProps, N
 	double dKoef = 72.0 / (36000 * 25.4);
     if (L"wp:inline" == oNode.GetName())
 	{
-		nullable_int margT; oNode.ReadAttributeBase(L"distT", margT);
-		nullable_int margB; oNode.ReadAttributeBase(L"distB", margB);
-		nullable_int margL; oNode.ReadAttributeBase(L"distL", margL);
-		nullable_int margR; oNode.ReadAttributeBase(L"distR", margR);
+        nullable_int margT; XmlMacroReadAttributeBase(oNode, L"distT", margT);
+        nullable_int margB; XmlMacroReadAttributeBase(oNode, L"distB", margB);
+        nullable_int margL; XmlMacroReadAttributeBase(oNode, L"distL", margL);
+        nullable_int margR; XmlMacroReadAttributeBase(oNode, L"distR", margR);
 
 		if (margL.is_init())
             oWriter.WriteAttributeCSS_double1_pt(L"mso-wrap-distance-left", dKoef * (*margL));
@@ -5089,14 +5089,14 @@ void CDrawingConverter::ConvertMainPropsToVML(const std::wstring& bsMainProps, N
 	else
 	{
         oWriter.WriteAttributeCSS(L"position", L"absolute");
-		nullable_int margT; oNode.ReadAttributeBase(L"distT", margT);
-		nullable_int margB; oNode.ReadAttributeBase(L"distB", margB);
-		nullable_int margL; oNode.ReadAttributeBase(L"distL", margL);
-		nullable_int margR; oNode.ReadAttributeBase(L"distR", margR);
+        nullable_int margT; XmlMacroReadAttributeBase(oNode, L"distT", margT);
+        nullable_int margB; XmlMacroReadAttributeBase(oNode, L"distB", margB);
+        nullable_int margL; XmlMacroReadAttributeBase(oNode, L"distL", margL);
+        nullable_int margR; XmlMacroReadAttributeBase(oNode, L"distR", margR);
 
-		nullable_bool behindDoc;	oNode.ReadAttributeBase(L"behindDoc", behindDoc);
-		nullable_bool allowOverlap; oNode.ReadAttributeBase(L"allowOverlap", allowOverlap);
-		nullable_bool layoutInCell; oNode.ReadAttributeBase(L"layoutInCell", layoutInCell);
+        nullable_bool behindDoc;	XmlMacroReadAttributeBase(oNode, L"behindDoc", behindDoc);
+        nullable_bool allowOverlap; XmlMacroReadAttributeBase(oNode, L"allowOverlap", allowOverlap);
+        nullable_bool layoutInCell; XmlMacroReadAttributeBase(oNode, L"layoutInCell", layoutInCell);
 
 		if (margL.is_init())
             oWriter.WriteAttributeCSS_double1_pt(L"mso-wrap-distance-left", dKoef * (*margL));
@@ -5107,7 +5107,7 @@ void CDrawingConverter::ConvertMainPropsToVML(const std::wstring& bsMainProps, N
 		if (margB.is_init())
             oWriter.WriteAttributeCSS_double1_pt(L"mso-wrap-distance-bottom", dKoef * (*margB));
 
-		nullable_int64 zIndex; oNode.ReadAttributeBase(L"relativeHeight", zIndex);
+        nullable_int64 zIndex; XmlMacroReadAttributeBase(oNode, L"relativeHeight", zIndex);
 		if (zIndex.is_init())
         {
             _INT64 z_index = *zIndex;
diff --git a/ASCOfficePPTXFile/PPTXFormat/App.h b/ASCOfficePPTXFile/PPTXFormat/App.h
index 0a64790814..3ab140b969 100644
--- a/ASCOfficePPTXFile/PPTXFormat/App.h
+++ b/ASCOfficePPTXFile/PPTXFormat/App.h
@@ -63,39 +63,39 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadNodeValueBase(L"Template", Template);
-			oNode.ReadNodeValueBase(L"TotalTime", TotalTime);
-			oNode.ReadNodeValueBase(L"Words", Words);
-			oNode.ReadNodeValueBase(L"Application", Application);
-			oNode.ReadNodeValueBase(L"PresentationFormat", PresentationFormat);
-			oNode.ReadNodeValueBase(L"Paragraphs", Paragraphs);
-			oNode.ReadNodeValueBase(L"Slides", Slides);
-			oNode.ReadNodeValueBase(L"Notes", Notes);
-			oNode.ReadNodeValueBase(L"HiddenSlides", HiddenSlides);
-			oNode.ReadNodeValueBase(L"MMClips", MMClips);
-			oNode.ReadNodeValueBase(L"ScaleCrop", ScaleCrop);
+            XmlMacroReadNodeValueBase(oNode, L"Template", Template);
+            XmlMacroReadNodeValueBase(oNode, L"TotalTime", TotalTime);
+            XmlMacroReadNodeValueBase(oNode, L"Words", Words);
+            XmlMacroReadNodeValueBase(oNode, L"Application", Application);
+            XmlMacroReadNodeValueBase(oNode, L"PresentationFormat", PresentationFormat);
+            XmlMacroReadNodeValueBase(oNode, L"Paragraphs", Paragraphs);
+            XmlMacroReadNodeValueBase(oNode, L"Slides", Slides);
+            XmlMacroReadNodeValueBase(oNode, L"Notes", Notes);
+            XmlMacroReadNodeValueBase(oNode, L"HiddenSlides", HiddenSlides);
+            XmlMacroReadNodeValueBase(oNode, L"MMClips", MMClips);
+            XmlMacroReadNodeValueBase(oNode, L"ScaleCrop", ScaleCrop);
 
 			XmlUtils::CXmlNode oHP = oNode.ReadNode(_T("HeadingPairs"));
 			XmlUtils::CXmlNode oNodeVector1;
 			if (oHP.GetNode(_T("vt:vector"), oNodeVector1))
 			{
-				oNodeVector1.ReadAttributeBase(_T("size"), m_Headings);
-				oNodeVector1.LoadArray(_T("vt:variant"), HeadingPairs);
+                XmlMacroReadAttributeBase(oNodeVector1, _T("size"), m_Headings);
+                XmlMacroLoadArray(oNodeVector1, _T("vt:variant"), HeadingPairs, Logic::HeadingVariant);
 			}
 
 			XmlUtils::CXmlNode oTP = oNode.ReadNode(_T("TitlesOfParts"));
 			XmlUtils::CXmlNode oNodeVector2;
 			if (oTP.GetNode(_T("vt:vector"), oNodeVector2))
 			{
-				oNodeVector2.ReadAttributeBase(_T("size"), m_VectorSize);
-				oNodeVector2.LoadArray(_T("vt:variant"), TitlesOfParts);
+                XmlMacroReadAttributeBase(oNodeVector2, _T("size"), m_VectorSize);
+                XmlMacroLoadArray(oNodeVector2, _T("vt:variant"), TitlesOfParts, Logic::PartTitle);
 			}
 
-			oNode.ReadNodeValueBase(L"Company", Company);
-			oNode.ReadNodeValueBase(L"LinksUpToDate", LinksUpToDate);
-			oNode.ReadNodeValueBase(L"SharedDoc", SharedDoc);
-			oNode.ReadNodeValueBase(L"HyperlinksChanged", HyperlinksChanged);
-			oNode.ReadNodeValueBase(L"AppVersion", AppVersion);
+            XmlMacroReadAttributeBase(oNode, L"Company", Company);
+            XmlMacroReadAttributeBase(oNode, L"LinksUpToDate", LinksUpToDate);
+            XmlMacroReadAttributeBase(oNode, L"SharedDoc", SharedDoc);
+            XmlMacroReadAttributeBase(oNode, L"HyperlinksChanged", HyperlinksChanged);
+            XmlMacroReadAttributeBase(oNode, L"AppVersion", AppVersion);
 			
 			//Characters = document.Root.element("Characters").text();
 			//CharactersWithSpaces = document.Root.element("CharactersWithSpaces").text();
@@ -263,4 +263,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_APP_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_APP_FILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/CommentAuthors.h b/ASCOfficePPTXFile/PPTXFormat/CommentAuthors.h
index b6e0946484..a05adb1919 100644
--- a/ASCOfficePPTXFile/PPTXFormat/CommentAuthors.h
+++ b/ASCOfficePPTXFile/PPTXFormat/CommentAuthors.h
@@ -54,11 +54,11 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"id", id);
-				node.ReadAttributeBase(L"lastIdx", last_idx);
-				node.ReadAttributeBase(L"clrIdx", clr_idx);
-				node.ReadAttributeBase(L"name", name);
-				node.ReadAttributeBase(L"initials", initials);
+				XmlMacroReadAttributeBase(node, L"id", id);
+				XmlMacroReadAttributeBase(node, L"lastIdx", last_idx);
+				XmlMacroReadAttributeBase(node, L"clrIdx", clr_idx);
+				XmlMacroReadAttributeBase(node, L"name", name);
+				XmlMacroReadAttributeBase(node, L"initials", initials);
 			}
 
 			virtual std::wstring toXML() const
diff --git a/ASCOfficePPTXFile/PPTXFormat/Comments.h b/ASCOfficePPTXFile/PPTXFormat/Comments.h
index 0eb98dbeb1..0059a78921 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Comments.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Comments.h
@@ -61,15 +61,15 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"authorId", authorId);
-				node.ReadAttributeBase(L"dt", dt);
-				node.ReadAttributeBase(L"idx", idx);
+				XmlMacroReadAttributeBase(node, L"authorId", authorId);
+				XmlMacroReadAttributeBase(node, L"dt", dt);
+				XmlMacroReadAttributeBase(node, L"idx", idx);
 
 				XmlUtils::CXmlNode oNodePos = node.ReadNode(_T("p:pos"));
 				if (oNodePos.IsValid())
 				{
-					oNodePos.ReadAttributeBase(L"x", pos_x);
-					oNodePos.ReadAttributeBase(L"y", pos_y);
+					XmlMacroReadAttributeBase(oNodePos, L"x", pos_x);
+					XmlMacroReadAttributeBase(oNodePos, L"y", pos_y);
 				}
 				
 				XmlUtils::CXmlNode oNodeText = node.ReadNode(_T("p:text"));
@@ -99,8 +99,8 @@ namespace PPTX
 								{
 									XmlUtils::CXmlNode oNodeParent = oNodeTI.ReadNode(_T("p15:parentCm"));
 
-									oNodeParent.ReadAttributeBase(L"authorId", parentAuthorId);
-									oNodeParent.ReadAttributeBase(L"idx", parentCommentId);
+									XmlMacroReadAttributeBase(oNodeParent, L"authorId", parentAuthorId);
+									XmlMacroReadAttributeBase(oNodeParent, L"idx", parentCommentId);
 
 									bIsFound1 = true;
 								}
@@ -129,8 +129,8 @@ namespace PPTX
 						{
 							XmlUtils::CXmlNode oNodeParent = oNodeTI.ReadNode(_T("p15:parentCm"));
 
-							oNodeParent.ReadAttributeBase(L"authorId", parentAuthorId);
-							oNodeParent.ReadAttributeBase(L"idx", parentCommentId);
+							XmlMacroReadAttributeBase(oNodeParent, L"authorId", parentAuthorId);
+							XmlMacroReadAttributeBase(oNodeParent, L"idx", parentCommentId);
 						}
 					}
 				}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Core.h b/ASCOfficePPTXFile/PPTXFormat/Core.h
index 90252c7847..68d75b65a9 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Core.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Core.h
@@ -61,12 +61,12 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadNodeValueBase(_T("dc:title"), title);
-			oNode.ReadNodeValueBase(_T("dc:creator"), creator);
-			oNode.ReadNodeValueBase(_T("cp:lastModifiedBy"), lastModifiedBy);
-			oNode.ReadNodeValueBase(_T("cp:revision"), revision);
-			oNode.ReadNodeValueBase(_T("dcterms:modified"), modified);
-			oNode.ReadNodeValueBase(_T("dcterms:created"), created);
+            XmlMacroReadNodeValueBase(oNode, _T("dc:title"), title);
+            XmlMacroReadAttributeBase(oNode, _T("dc:creator"), creator);
+            XmlMacroReadAttributeBase(oNode, _T("cp:lastModifiedBy"), lastModifiedBy);
+            XmlMacroReadAttributeBase(oNode, _T("cp:revision"), revision);
+            XmlMacroReadAttributeBase(oNode, _T("dcterms:modified"), modified);
+            XmlMacroReadAttributeBase(oNode, _T("dcterms:created"), created);
 
 	//		created = PPTX::DateTime::Parse(document.Root.element("created").text().ToString());
 	//			modified = PPTX::DateTime::Parse(document.Root.element("modified").text().ToString());
@@ -165,4 +165,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_CORE_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_CORE_FILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/AhPolar.h b/ASCOfficePPTXFile/PPTXFormat/Logic/AhPolar.h
index 80c169a1db..011bfa6de2 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/AhPolar.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/AhPolar.h
@@ -53,12 +53,12 @@ namespace PPTX
 				x	= oPos.GetAttributeBase(L"x");
 				y	= oPos.GetAttributeBase(L"y");
 
-				node.ReadAttributeBase(L"gdRefAng", gdRefAng);
-				node.ReadAttributeBase(L"gdRefR", gdRefR);
-				node.ReadAttributeBase(L"maxAng", maxAng);
-				node.ReadAttributeBase(L"maxR", maxR);
-				node.ReadAttributeBase(L"minAng", minAng);
-				node.ReadAttributeBase(L"minR", minR);
+				XmlMacroReadAttributeBase(node, L"gdRefAng", gdRefAng);
+				XmlMacroReadAttributeBase(node, L"gdRefR", gdRefR);
+				XmlMacroReadAttributeBase(node, L"maxAng", maxAng);
+				XmlMacroReadAttributeBase(node, L"maxR", maxR);
+				XmlMacroReadAttributeBase(node, L"minAng", minAng);
+				XmlMacroReadAttributeBase(node, L"minR", minR);
 			}
 			virtual OOX::EElementType getType() const
 			{
@@ -192,4 +192,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_AHPOLAR_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_AHPOLAR_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/AhXY.h b/ASCOfficePPTXFile/PPTXFormat/Logic/AhXY.h
index 6c41256bfe..3c29d7eec8 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/AhXY.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/AhXY.h
@@ -53,12 +53,12 @@ namespace PPTX
 				x	= oPos.ReadAttributeBase(L"x");
 				y	= oPos.ReadAttributeBase(L"y");
 
-				node.ReadAttributeBase(L"gdRefX", gdRefX);
-				node.ReadAttributeBase(L"gdRefY", gdRefY);
-				node.ReadAttributeBase(L"maxX", maxX);
-				node.ReadAttributeBase(L"maxY", maxY);
-				node.ReadAttributeBase(L"minX", minX);
-				node.ReadAttributeBase(L"minY", minY);
+				XmlMacroReadAttributeBase(node, L"gdRefX", gdRefX);
+				XmlMacroReadAttributeBase(node, L"gdRefY", gdRefY);
+				XmlMacroReadAttributeBase(node, L"maxX", maxX);
+				XmlMacroReadAttributeBase(node, L"maxY", maxY);
+				XmlMacroReadAttributeBase(node, L"minX", minX);
+				XmlMacroReadAttributeBase(node, L"minY", minY);
 			}
 			virtual OOX::EElementType getType() const
 			{
@@ -193,4 +193,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_AHXY_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_AHXY_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h
index b29494a8b6..2f69b7e1aa 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h
@@ -75,9 +75,9 @@ namespace PPTX
 			{
 				m_name	= XmlUtils::GetNameNoNS(node.GetName());
 				
-				node.ReadAttributeBase(L"w", w);
-				node.ReadAttributeBase(L"h", h);
-				node.ReadAttributeBase(L"prst", prst);
+				XmlMacroReadAttributeBase(node, L"w", w);
+				XmlMacroReadAttributeBase(node, L"h", h);
+				XmlMacroReadAttributeBase(node, L"prst", prst);
 			}
 
 			virtual std::wstring toXML() const
@@ -149,4 +149,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BEVEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_BEVEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp
index f9e801088e..01ee4ba4ec 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp
@@ -66,7 +66,7 @@ namespace PPTX
 
 		void Bg::fromXML(XmlUtils::CXmlNode& node)
 		{
-			node.ReadAttributeBase(L"bwMode", bwMode);
+            XmlMacroReadAttributeBase(node, L"bwMode", bwMode);
 			bgPr	= node.ReadNodeNoNS(_T("bgPr"));
 			bgRef	= node.ReadNodeNoNS(_T("bgRef"));
 
@@ -113,4 +113,4 @@ namespace PPTX
 		}
 
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/BgPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/BgPr.h
index 7bef4d3c6c..1d7e128cf1 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/BgPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/BgPr.h
@@ -50,7 +50,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"shadeToTitle", shadeToTitle);
+                XmlMacroReadAttributeBase(node, L"shadeToTitle", shadeToTitle);
 				Fill.GetFillFrom(node);
 				EffectList.GetEffectListFrom(node);
 
@@ -148,4 +148,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SLIDE_BGPR_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SLIDE_BGPR_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h
index 07eddecdc9..04e4f281d0 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h
@@ -118,32 +118,32 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"anchor", anchor);
-				node.ReadAttributeBase(L"anchorCtr", anchorCtr);
-				node.ReadAttributeBase(L"bIns", bIns);
-				node.ReadAttributeBase(L"compatLnSpc", compatLnSpc);
-				node.ReadAttributeBase(L"forceAA", forceAA);
-				node.ReadAttributeBase(L"fromWordArt", fromWordArt);
-				node.ReadAttributeBase(L"horzOverflow", horzOverflow);
-				node.ReadAttributeBase(L"lIns", lIns);
-				node.ReadAttributeBase(L"numCol", numCol);
-				node.ReadAttributeBase(L"rIns", rIns);
-				node.ReadAttributeBase(L"rot", rot);
-				node.ReadAttributeBase(L"rtlCol", rtlCol);
-				node.ReadAttributeBase(L"spcCol", spcCol);
-				node.ReadAttributeBase(L"spcFirstLastPara", spcFirstLastPara);
-				node.ReadAttributeBase(L"tIns", tIns);
-				node.ReadAttributeBase(L"upright", upright);
-				node.ReadAttributeBase(L"vert", vert);
-				node.ReadAttributeBase(L"vertOverflow", vertOverflow);
-				node.ReadAttributeBase(L"wrap", wrap);
+				XmlMacroReadAttributeBase(node, L"anchor", anchor);
+				XmlMacroReadAttributeBase(node, L"anchorCtr", anchorCtr);
+				XmlMacroReadAttributeBase(node, L"bIns", bIns);
+				XmlMacroReadAttributeBase(node, L"compatLnSpc", compatLnSpc);
+				XmlMacroReadAttributeBase(node, L"forceAA", forceAA);
+				XmlMacroReadAttributeBase(node, L"fromWordArt", fromWordArt);
+				XmlMacroReadAttributeBase(node, L"horzOverflow", horzOverflow);
+				XmlMacroReadAttributeBase(node, L"lIns", lIns);
+				XmlMacroReadAttributeBase(node, L"numCol", numCol);
+				XmlMacroReadAttributeBase(node, L"rIns", rIns);
+				XmlMacroReadAttributeBase(node, L"rot", rot);
+				XmlMacroReadAttributeBase(node, L"rtlCol", rtlCol);
+				XmlMacroReadAttributeBase(node, L"spcCol", spcCol);
+				XmlMacroReadAttributeBase(node, L"spcFirstLastPara", spcFirstLastPara);
+				XmlMacroReadAttributeBase(node, L"tIns", tIns);
+				XmlMacroReadAttributeBase(node, L"upright", upright);
+				XmlMacroReadAttributeBase(node, L"vert", vert);
+				XmlMacroReadAttributeBase(node, L"vertOverflow", vertOverflow);
+				XmlMacroReadAttributeBase(node, L"wrap", wrap);
 
 				Fit.GetTextFitFrom(node);
 				prstTxWarp	= node.ReadNode(_T("a:prstTxWarp"));
 				scene3d		= node.ReadNode(_T("a:scene3d"));
 				
 				XmlUtils::CXmlNode oNode = node.ReadNodeNoNS(_T("flatTx"));
-				oNode.ReadAttributeBase(L"z", flatTx);
+				XmlMacroReadAttributeBase(oNode, L"z", flatTx);
 				
 				sp3d		= node.ReadNode(_T("a:sp3d"));
 
@@ -534,4 +534,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BODYPR_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BODYPR_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuAutoNum.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuAutoNum.h
index 3fff0a809b..49d874dd7d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuAutoNum.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuAutoNum.h
@@ -66,8 +66,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"type", type);
-				node.ReadAttributeBase(L"startAt", startAt);
+				XmlMacroReadAttributeBase(node, L"type", type);
+				XmlMacroReadAttributeBase(node, L"startAt", startAt);
 
 				Normalize();
 			}
@@ -118,4 +118,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BUAUTONUM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BUAUTONUM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h
index ea03a1ecb8..b64579971b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h
@@ -128,30 +128,30 @@ namespace PPTX
 				XmlUtils::CXmlNode l_Locks;
 				if (node.GetNode(_T("a:cxnSpLocks"), l_Locks))
 				{
-					l_Locks.ReadAttributeBase(L"noAdjustHandles", noAdjustHandles);
-					l_Locks.ReadAttributeBase(L"noChangeArrowheads", noChangeArrowheads);
-					l_Locks.ReadAttributeBase(L"noChangeAspect", noChangeAspect);
-					l_Locks.ReadAttributeBase(L"noChangeShapeType", noChangeShapeType);
-					l_Locks.ReadAttributeBase(L"noEditPoints", noEditPoints);
-					l_Locks.ReadAttributeBase(L"noGrp", noGrp);
-					l_Locks.ReadAttributeBase(L"noMove", noMove);
-					l_Locks.ReadAttributeBase(L"noResize", noResize);
-					l_Locks.ReadAttributeBase(L"noRot", noRot);
-					l_Locks.ReadAttributeBase(L"noSelect", noSelect);
+                    XmlMacroReadAttributeBase(l_Locks, L"noAdjustHandles", noAdjustHandles);
+                    XmlMacroReadAttributeBase(l_Locks, L"noChangeArrowheads", noChangeArrowheads);
+                    XmlMacroReadAttributeBase(l_Locks, L"noChangeAspect", noChangeAspect);
+                    XmlMacroReadAttributeBase(l_Locks, L"noChangeShapeType", noChangeShapeType);
+                    XmlMacroReadAttributeBase(l_Locks, L"noEditPoints", noEditPoints);
+                    XmlMacroReadAttributeBase(l_Locks, L"noGrp", noGrp);
+                    XmlMacroReadAttributeBase(l_Locks, L"noMove", noMove);
+                    XmlMacroReadAttributeBase(l_Locks, L"noResize", noResize);
+                    XmlMacroReadAttributeBase(l_Locks, L"noRot", noRot);
+                    XmlMacroReadAttributeBase(l_Locks, L"noSelect", noSelect);
 				}
 
 				XmlUtils::CXmlNode l_Cxn;
 				if (node.GetNode(_T("a:stCxn"), l_Cxn))
 				{
-					l_Cxn.ReadAttributeBase(L"id", stCxn_id);
-					l_Cxn.ReadAttributeBase(L"idx", stCxn_idx);
+                    XmlMacroReadAttributeBase(l_Cxn, L"id", stCxn_id);
+                    XmlMacroReadAttributeBase(l_Cxn, L"idx", stCxn_idx);
 				}
 
 				XmlUtils::CXmlNode l_endCxn;
 				if (node.GetNode(_T("a:endCxn"), l_endCxn))
 				{
-					l_endCxn.ReadAttributeBase(L"id", endCxn_id);
-					l_endCxn.ReadAttributeBase(L"idx", endCxn_idx);
+                    XmlMacroReadAttributeBase(l_endCxn, L"id", endCxn_id);
+                    XmlMacroReadAttributeBase(l_endCxn, L"idx", endCxn_idx);
 				}
 			}
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGraphicFramePr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGraphicFramePr.h
index 00b9c5fbca..c91a114551 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGraphicFramePr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGraphicFramePr.h
@@ -101,12 +101,12 @@ namespace PPTX
 				XmlUtils::CXmlNode oNode = node.ReadNodeNoNS(L"graphicFrameLocks");	
 				if (oNode.IsValid())
 				{
-					oNode.ReadAttributeBase(L"noChangeAspect",	noChangeAspect);
-					oNode.ReadAttributeBase(L"noDrilldown",		noDrilldown);
-					oNode.ReadAttributeBase(L"noGrp",			noGrp);
-					oNode.ReadAttributeBase(L"noMove",			noMove);
-					oNode.ReadAttributeBase(L"noResize",		noResize);
-					oNode.ReadAttributeBase(L"noSelect",		noSelect);
+					XmlMacroReadAttributeBase(oNode, L"noChangeAspect",	noChangeAspect);
+					XmlMacroReadAttributeBase(oNode, L"noDrilldown",		noDrilldown);
+					XmlMacroReadAttributeBase(oNode, L"noGrp",			noGrp);
+					XmlMacroReadAttributeBase(oNode, L"noMove",			noMove);
+					XmlMacroReadAttributeBase(oNode, L"noResize",		noResize);
+					XmlMacroReadAttributeBase(oNode, L"noSelect",		noSelect);
 				}
 			}
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.cpp
index 743614d38b..566002d3bf 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.cpp
@@ -58,13 +58,13 @@ namespace PPTX
 			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);
+                XmlMacroReadAttributeBase(oNode, L"noChangeAspect", noChangeAspect);
+                XmlMacroReadAttributeBase(oNode, L"noGrp", noGrp);
+                XmlMacroReadAttributeBase(oNode, L"noMove", noMove);
+                XmlMacroReadAttributeBase(oNode, L"noResize", noResize);
+                XmlMacroReadAttributeBase(oNode, L"noRot", noRot);
+                XmlMacroReadAttributeBase(oNode, L"noSelect", noSelect);
+                XmlMacroReadAttributeBase(oNode, L"noUngrp", noUngrp);
 			}
 		}
 		void CNvGrpSpPr::ReadAttributesLocks(XmlUtils::CXmlLiteReader& oReader)
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPicPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPicPr.h
index 2ed0795162..8b1276e3f2 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPicPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPicPr.h
@@ -118,22 +118,22 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"preferRelativeResize", preferRelativeResize);
+				XmlMacroReadAttributeBase(node, L"preferRelativeResize", preferRelativeResize);
 
 				XmlUtils::CXmlNode oNode;
 				if (node.GetNode(_T("a:picLocks"), oNode))
 				{
-					oNode.ReadAttributeBase(L"noAdjustHandles", noAdjustHandles);
-					oNode.ReadAttributeBase(L"noChangeArrowheads", noChangeArrowheads);
-					oNode.ReadAttributeBase(L"noChangeAspect", noChangeAspect);
-					oNode.ReadAttributeBase(L"noChangeShapeType", noChangeShapeType);
-					oNode.ReadAttributeBase(L"noCrop", noCrop);
-					oNode.ReadAttributeBase(L"noEditPoints", noEditPoints);
-					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);
+					XmlMacroReadAttributeBase(oNode, L"noAdjustHandles", noAdjustHandles);
+					XmlMacroReadAttributeBase(oNode, L"noChangeArrowheads", noChangeArrowheads);
+					XmlMacroReadAttributeBase(oNode, L"noChangeAspect", noChangeAspect);
+					XmlMacroReadAttributeBase(oNode, L"noChangeShapeType", noChangeShapeType);
+					XmlMacroReadAttributeBase(oNode, L"noCrop", noCrop);
+					XmlMacroReadAttributeBase(oNode, L"noEditPoints", noEditPoints);
+					XmlMacroReadAttributeBase(oNode, L"noGrp", noGrp);
+					XmlMacroReadAttributeBase(oNode, L"noMove", noMove);
+					XmlMacroReadAttributeBase(oNode, L"noResize", noResize);
+					XmlMacroReadAttributeBase(oNode, L"noRot", noRot);
+					XmlMacroReadAttributeBase(oNode, L"noSelect", noSelect);
 				}
 			}
 
@@ -324,4 +324,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CNVPICPR_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CNVPICPR_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h
index e5d3dcd4d5..deee02f0c6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h
@@ -114,9 +114,9 @@ namespace PPTX
 				id		= node.ReadAttributeInt(L"id");
 				name	= node.GetAttribute(L"name");
 				
-				node.ReadAttributeBase(L"descr", descr);
-				node.ReadAttributeBase(L"hidden", hidden);
-				node.ReadAttributeBase(L"title", title);
+				XmlMacroReadAttributeBase(node, L"descr", descr);
+				XmlMacroReadAttributeBase(node, L"hidden", hidden);
+				XmlMacroReadAttributeBase(node, L"title", title);
 
 				hlinkClick = node.ReadNode(_T("a:hlinkClick"));
 				hlinkHover = node.ReadNode(_T("a:hlinkHover"));
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvSpPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvSpPr.h
index 7f299ee3de..fcadb47406 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvSpPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvSpPr.h
@@ -116,22 +116,22 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"txBox", txBox);
+				XmlMacroReadAttributeBase(node, L"txBox", txBox);
 				
 				XmlUtils::CXmlNode l_Locks;
 				if (node.GetNode(_T("a:spLocks"), l_Locks))
 				{
-					l_Locks.ReadAttributeBase(L"noAdjustHandles", noAdjustHandles);
-					l_Locks.ReadAttributeBase(L"noChangeArrowheads", noChangeArrowheads);
-					l_Locks.ReadAttributeBase(L"noChangeAspect", noChangeAspect);
-					l_Locks.ReadAttributeBase(L"noChangeShapeType", noChangeShapeType);
-					l_Locks.ReadAttributeBase(L"noEditPoints", noEditPoints);
-					l_Locks.ReadAttributeBase(L"noGrp", noGrp);
-					l_Locks.ReadAttributeBase(L"noMove", noMove);
-					l_Locks.ReadAttributeBase(L"noResize", noResize);
-					l_Locks.ReadAttributeBase(L"noRot", noRot);
-					l_Locks.ReadAttributeBase(L"noSelect", noSelect);
-					l_Locks.ReadAttributeBase(L"noTextEdit", noTextEdit);
+					XmlMacroReadAttributeBase(l_Locks, L"noAdjustHandles", noAdjustHandles);
+					XmlMacroReadAttributeBase(l_Locks, L"noChangeArrowheads", noChangeArrowheads);
+					XmlMacroReadAttributeBase(l_Locks, L"noChangeAspect", noChangeAspect);
+					XmlMacroReadAttributeBase(l_Locks, L"noChangeShapeType", noChangeShapeType);
+					XmlMacroReadAttributeBase(l_Locks, L"noEditPoints", noEditPoints);
+					XmlMacroReadAttributeBase(l_Locks, L"noGrp", noGrp);
+					XmlMacroReadAttributeBase(l_Locks, L"noMove", noMove);
+					XmlMacroReadAttributeBase(l_Locks, L"noResize", noResize);
+					XmlMacroReadAttributeBase(l_Locks, L"noRot", noRot);
+					XmlMacroReadAttributeBase(l_Locks, L"noSelect", noSelect);
+					XmlMacroReadAttributeBase(l_Locks, L"noTextEdit", noTextEdit);
 				}
 			}
 			virtual std::wstring toXML() const
@@ -363,4 +363,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CNVSPPR_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CNVSPPR_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CSld.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CSld.h
index d1700348ef..df9c668914 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CSld.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CSld.h
@@ -56,7 +56,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"name", attrName);
+                XmlMacroReadAttributeBase(node, L"name", attrName);
 				
 				bg			= node.ReadNode(_T("p:bg"));
 				spTree		= node.ReadNodeNoNS(_T("spTree"));
@@ -184,4 +184,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_SLIDES_COMMON_SLIDE_DATA_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_SLIDES_COMMON_SLIDE_DATA_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h
index 1fac654b64..f11a625b15 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h
@@ -83,8 +83,8 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				prst	= node.GetAttribute(_T("prst"));
-				node.ReadAttributeBase(L"fov", fov);
-				node.ReadAttributeBase(L"zoom", zoom);
+				XmlMacroReadAttributeBase(node, L"fov", fov);
+				XmlMacroReadAttributeBase(node, L"zoom", zoom);
 
                 std::wstring sRotNodeName = _T("a:rot");
                 rot		= node.ReadNode(sRotNodeName);
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Cell3D.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Cell3D.h
index 9a73d3d98b..6480801514 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Cell3D.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Cell3D.h
@@ -78,7 +78,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"prstMaterial", prstMaterial);
+				XmlMacroReadAttributeBase(node, L"prstMaterial", prstMaterial);
 
 				bevel		= node.ReadNodeNoNS(_T("bevel"));
 				lightRig	= node.ReadNodeNoNS(_T("lightRig"));
@@ -124,4 +124,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CELL3D_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_CELL3D_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h
index e51663b8c7..bd395fd7b4 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h
@@ -87,12 +87,12 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name	= node.GetName();
-				node.ReadAttributeBase(L"val", val);
+				XmlMacroReadAttributeBase(node, L"val", val);
 
 				if (XmlUtils::GetNameNoNS(name) == _T("alpha"))
 				{
 					nullable_string sTmp;
-					node.ReadAttributeBase(L"val", sTmp);
+					XmlMacroReadAttributeBase(node, L"val", sTmp);
 
                     if (val.is_init() && sTmp.is_init() && std::wstring::npos != sTmp->find(L"%"))
 						*val = (*val) * 1000;
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/PrstClr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/PrstClr.h
index 92f3deb985..552947dd4f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/PrstClr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/PrstClr.h
@@ -77,7 +77,7 @@ namespace PPTX
 			{
 				val = node.GetAttribute(_T("val"));
 				Modifiers.clear();
-				node.LoadArray(_T("*"), Modifiers);
+                XmlMacroLoadArray(node, _T("*"), Modifiers, ColorModifier);
 			}
 
 			virtual std::wstring toXML() const
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.cpp
index f343ff517e..9b267b63fc 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.cpp
@@ -47,7 +47,7 @@ namespace PPTX
 		{
 			val = node.GetAttribute(_T("val"));
 			Modifiers.clear();
-			node.LoadArray(_T("*"), Modifiers);
+            XmlMacroLoadArray(node, _T("*"), Modifiers, ColorModifier);
 		}
 		void SchemeClr::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -187,4 +187,4 @@ namespace PPTX
 			alpha	= static_cast<unsigned char>((RGB & 0xFF000000)>>24);
 		}
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h
index 1d5199b297..1c439185b6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h
@@ -96,7 +96,7 @@ namespace PPTX
                 }
 
 				Modifiers.clear();
-				node.LoadArray(_T("*"), Modifiers);
+                XmlMacroLoadArray(node, _T("*"), Modifiers, ColorModifier);
 			}
 			virtual void fromXMLScRgb(XmlUtils::CXmlNode& node)
 			{
@@ -109,7 +109,7 @@ namespace PPTX
 				blue	= (unsigned char)(255 * scRGB_to_sRGB(cblue / 100000.0));
 
 				Modifiers.clear();
-				node.LoadArray(_T("*"), Modifiers);
+                XmlMacroLoadArray(node, _T("*"), Modifiers, ColorModifier);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -190,7 +190,7 @@ namespace PPTX
 			}
 
 		protected:
-			virtual void FillParentPointersForChilds(){};
+            virtual void FillParentPointersForChilds(){}
 		};
 	} // namespace Logic
 } // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SysClr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SysClr.h
index 2fba29c3a9..97fc10f70b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SysClr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SysClr.h
@@ -147,7 +147,7 @@ namespace PPTX
 			{
 				val = node.GetAttribute(_T("val"));
 				Modifiers.clear();
-				node.LoadArray(_T("*"), Modifiers);
+                XmlMacroLoadArray(node, _T("*"), Modifiers, ColorModifier);
 			}
 			virtual OOX::EElementType getType() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Controls.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Controls.h
index e821659264..fd65f085e9 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Controls.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Controls.h
@@ -59,10 +59,10 @@ namespace PPTX
 				name	= node.GetAttribute(_T("name"));
 				spid	= node.GetAttribute(_T("spid"));
 				
-				node.ReadAttributeBase(L"rId"		, rId);
-				node.ReadAttributeBase(L"width"		, width);
-				node.ReadAttributeBase(L"height"	, height);
-				node.ReadAttributeBase(L"showAsIcon", showAsIcon);				
+                XmlMacroReadAttributeBase(node, L"rId"		, rId);
+                XmlMacroReadAttributeBase(node, L"width"		, width);
+                XmlMacroReadAttributeBase(node, L"height"	, height);
+                XmlMacroReadAttributeBase(node, L"showAsIcon", showAsIcon);
 
 				pic = node.ReadNode(_T("p:pic"));
 
@@ -194,4 +194,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ACTIVEX_CONTROLS_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_ACTIVEX_CONTROLS_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/CustGeom.h b/ASCOfficePPTXFile/PPTXFormat/Logic/CustGeom.h
index f98e91cb59..8f4029f3cf 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CustGeom.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CustGeom.h
@@ -186,21 +186,21 @@ namespace PPTX
 			{
 				XmlUtils::CXmlNode oNode;
 				if (node.GetNode(_T("a:avLst"), oNode))
-					oNode.LoadArray(_T("a:gd"), avLst);
+					XmlMacroLoadArray(oNode, _T("a:gd"), avLst, Gd);
 				if (node.GetNode(_T("a:gdLst"), oNode))
-					oNode.LoadArray(_T("a:gd"), gdLst);
+					XmlMacroLoadArray(oNode, _T("a:gd"), gdLst, Gd);
 				
 				if (node.GetNode(_T("a:ahLst"), oNode))
 				{
-					oNode.LoadArray(_T("a:ahPolar"), ahLst);
-					oNode.LoadArray(_T("a:ahXY"), ahLst);
+					XmlMacroLoadArray(oNode, _T("a:ahPolar"), ahLst, AhBase);
+					XmlMacroLoadArray(oNode, _T("a:ahXY"), ahLst, AhBase);
 				}
 
 				if (node.GetNode(_T("a:cxnLst"), oNode))
-					oNode.LoadArray(_T("a:cxn"), cxnLst);
+					XmlMacroLoadArray(oNode, _T("a:cxn"), cxnLst, Cxn);
 
 				if (node.GetNode(_T("a:pathLst"), oNode))
-					oNode.LoadArray(_T("a:path"), pathLst);
+					XmlMacroLoadArray(oNode, _T("a:path"), pathLst, Path2D);
 
 				rect = node.ReadNodeNoNS(_T("rect"));
 
@@ -352,4 +352,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CUSTGEOM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CUSTGEOM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp
index 546d6e1f05..427ca3bd67 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp
@@ -56,10 +56,10 @@ namespace PPTX
 		void EffectDag::fromXML(XmlUtils::CXmlNode& node)
 		{
 			m_name	= node.GetName();
-			node.ReadAttributeBase(L"name", name);
-			node.ReadAttributeBase(L"type", type);
+            XmlMacroReadAttributeBase(node, L"name", name);
+            XmlMacroReadAttributeBase(node, L"type", type);
             Effects.clear();
-			node.LoadArray(_T("*"), Effects);
+            XmlMacroLoadArray(node, _T("*"), Effects, UniEffect);
 
 			FillParentPointersForChilds();
 		}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaBiLevel.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaBiLevel.h
index e5652aa173..51986f11e7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaBiLevel.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaBiLevel.h
@@ -73,7 +73,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"thresh", thresh);
+                XmlMacroReadAttributeBase(node, L"thresh", thresh);
 				Normalize();
 			}
 
@@ -109,4 +109,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ALPHABILEVEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_ALPHABILEVEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaModFix.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaModFix.h
index f8b24a5ffd..2b2dbc2fe6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaModFix.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaModFix.h
@@ -72,7 +72,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"amt", amt);
+				XmlMacroReadAttributeBase(node, L"amt", amt);
 				Normalize();
 			}
 
@@ -121,4 +121,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ALPHAMODFIX_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_ALPHAMODFIX_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaOutset.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaOutset.h
index 27eeb627fd..b010499505 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaOutset.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaOutset.h
@@ -71,7 +71,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"rad", rad);
+                XmlMacroReadAttributeBase(node, L"rad", rad);
 			}
 
 			virtual std::wstring toXML() const
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaRepl.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaRepl.h
index ad3e2fb974..015808a0b8 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaRepl.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaRepl.h
@@ -72,7 +72,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"a", a);
+                XmlMacroReadAttributeBase(node, L"a", a);
 				Normalize();
 			}
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/BiLevel.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/BiLevel.h
index 89a7a6c168..dd1510dc56 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/BiLevel.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/BiLevel.h
@@ -73,7 +73,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"thresh", thresh);
+                XmlMacroReadAttributeBase(node, L"thresh", thresh);
 				Normalize();
 			}
 
@@ -108,4 +108,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BILEVEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_BILEVEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blur.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blur.h
index 4ae312df9a..ea7da5ef2b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blur.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blur.h
@@ -73,8 +73,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"rad", rad);
-				node.ReadAttributeBase(L"grow", grow);
+				XmlMacroReadAttributeBase(node, L"rad", rad);
+				XmlMacroReadAttributeBase(node, L"grow", grow);
 			}
 
 			virtual std::wstring toXML() const
@@ -107,4 +107,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLUR_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_BLUR_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h
index bfc928cccc..54680aa0fb 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h
@@ -94,7 +94,7 @@ namespace PPTX
                 node1 = node.ReadNode(_T("a:clrTo"));
                 ClrTo.GetColorFrom(node1);
 
-                node.ReadAttributeBase(L"useA", useA);
+                XmlMacroReadAttributeBase(node, L"useA", useA);
 				FillParentPointersForChilds();
 			}
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Duotone.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Duotone.h
index 5441e6b3c0..979e33c528 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Duotone.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Duotone.h
@@ -77,7 +77,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				Colors.clear();
-				node.LoadArray(_T("*"), Colors);
+                XmlMacroLoadArray(node, _T("*"), Colors, UniColor);
 				FillParentPointersForChilds();
 			}
 			virtual std::wstring toXML() const
@@ -116,4 +116,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_DUOTONE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_DUOTONE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h
index 56b58bc410..d679434a40 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h
@@ -72,7 +72,7 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"ref", ref);
+                XmlMacroReadAttributeBase(node, L"ref", ref);
 			}
 
 			virtual std::wstring toXML() const
@@ -102,4 +102,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_EFFECTELEMENT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_EFFECTELEMENT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h
index 047c2efb45..d164bb3e06 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h
@@ -86,7 +86,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				Color.GetColorFrom(node);
-				node.ReadAttributeBase(L"rad", rad);
+				XmlMacroReadAttributeBase(node, L"rad", rad);
 				
 				FillParentPointersForChilds();
 				Normalize();
@@ -130,4 +130,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_GLOW_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_GLOW_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/HslEffect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/HslEffect.h
index 0580448c8a..9e38937102 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/HslEffect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/HslEffect.h
@@ -76,9 +76,9 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"hue", hue);
-				node.ReadAttributeBase(L"sat", sat);
-				node.ReadAttributeBase(L"lum", lum);
+                XmlMacroReadAttributeBase(node, L"hue", hue);
+                XmlMacroReadAttributeBase(node, L"sat", sat);
+                XmlMacroReadAttributeBase(node, L"lum", lum);
 
 				Normalize();
 			}
@@ -120,4 +120,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_HSLEFFECT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_HSLEFFECT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h
index 8e0a9afe00..021e379392 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h
@@ -91,9 +91,9 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				Color.GetColorFrom(node);
-				node.ReadAttributeBase(L"blurRad", blurRad);
-				node.ReadAttributeBase(L"dir", dir);
-				node.ReadAttributeBase(L"dist", dist);
+				XmlMacroReadAttributeBase(node, L"blurRad", blurRad);
+				XmlMacroReadAttributeBase(node, L"dir", dir);
+				XmlMacroReadAttributeBase(node, L"dist", dist);
 
 				Normalize();
 				FillParentPointersForChilds();
@@ -147,4 +147,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_INNERSHDW_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_INNERSHDW_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h
index 5898c64a7e..2ebc30c737 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h
@@ -72,8 +72,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"bright", bright);
-				node.ReadAttributeBase(L"contrast", contrast);
+                XmlMacroReadAttributeBase(node, L"bright", bright);
+                XmlMacroReadAttributeBase(node, L"contrast", contrast);
 			}
 
 			virtual std::wstring toXML() const
@@ -104,4 +104,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_LUMEFFECT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_LUMEFFECT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h
index 43c4ebc42b..adf092bb52 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h
@@ -106,15 +106,15 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				Color.GetColorFrom(node);
-				node.ReadAttributeBase(L"algn", algn);
-				node.ReadAttributeBase(L"blurRad", blurRad);
-				node.ReadAttributeBase(L"dir", dir);
-				node.ReadAttributeBase(L"dist", dist);
-				node.ReadAttributeBase(L"kx", kx);
-				node.ReadAttributeBase(L"ky", ky);
-				node.ReadAttributeBase(L"rotWithShape", rotWithShape);
-				node.ReadAttributeBase(L"sx", sx);
-				node.ReadAttributeBase(L"sy", sy);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"blurRad", blurRad);
+				XmlMacroReadAttributeBase(node, L"dir", dir);
+				XmlMacroReadAttributeBase(node, L"dist", dist);
+				XmlMacroReadAttributeBase(node, L"kx", kx);
+				XmlMacroReadAttributeBase(node, L"ky", ky);
+				XmlMacroReadAttributeBase(node, L"rotWithShape", rotWithShape);
+				XmlMacroReadAttributeBase(node, L"sx", sx);
+				XmlMacroReadAttributeBase(node, L"sy", sy);
 
 				Normalize();
 
@@ -192,4 +192,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_OUTERSHDW_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_OUTERSHDW_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h
index 3f8d6b323c..2d349fa616 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h
@@ -96,8 +96,8 @@ namespace PPTX
 			{
 				Color.GetColorFrom(node);
 				prst	= node.GetAttribute(L"prst");
-				node.ReadAttributeBase(L"dir", dir);
-				node.ReadAttributeBase(L"dist", dist);
+				XmlMacroReadAttributeBase(node, L"dir", dir);
+				XmlMacroReadAttributeBase(node, L"dist", dist);
 
 				FillParentPointersForChilds();
 			}
@@ -151,4 +151,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PRSTSHDW_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_PRSTSHDW_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h
index 7fc812eead..5bf3ad0402 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h
@@ -100,20 +100,20 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"algn", algn);
-				node.ReadAttributeBase(L"blurRad", blurRad);
-				node.ReadAttributeBase(L"dir", dir);
-				node.ReadAttributeBase(L"dist", dist);
-				node.ReadAttributeBase(L"kx", kx);
-				node.ReadAttributeBase(L"ky", ky);
-				node.ReadAttributeBase(L"rotWithShape", rotWithShape);
-				node.ReadAttributeBase(L"sx", sx);
-				node.ReadAttributeBase(L"sy", sy);
-				node.ReadAttributeBase(L"stA", stA);
-				node.ReadAttributeBase(L"endA", endA);
-				node.ReadAttributeBase(L"stPos", stPos);
-				node.ReadAttributeBase(L"endPos", endPos);
-				node.ReadAttributeBase(L"fadeDir", fadeDir);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"blurRad", blurRad);
+				XmlMacroReadAttributeBase(node, L"dir", dir);
+				XmlMacroReadAttributeBase(node, L"dist", dist);
+				XmlMacroReadAttributeBase(node, L"kx", kx);
+				XmlMacroReadAttributeBase(node, L"ky", ky);
+				XmlMacroReadAttributeBase(node, L"rotWithShape", rotWithShape);
+				XmlMacroReadAttributeBase(node, L"sx", sx);
+				XmlMacroReadAttributeBase(node, L"sy", sy);
+				XmlMacroReadAttributeBase(node, L"stA", stA);
+				XmlMacroReadAttributeBase(node, L"endA", endA);
+				XmlMacroReadAttributeBase(node, L"stPos", stPos);
+				XmlMacroReadAttributeBase(node, L"endPos", endPos);
+				XmlMacroReadAttributeBase(node, L"fadeDir", fadeDir);
 
 				Normalize();
 			}
@@ -200,4 +200,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_REFLECTION_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_REFLECTION_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h
index 33932d4240..6f3d1b2737 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h
@@ -72,8 +72,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"tx", tx);
-				node.ReadAttributeBase(L"ty", ty);
+                XmlMacroReadAttributeBase(node, L"tx", tx);
+                XmlMacroReadAttributeBase(node, L"ty", ty);
 			}
 
 			virtual std::wstring toXML() const
@@ -106,4 +106,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_RELOFF_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_RELOFF_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/SoftEdge.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/SoftEdge.h
index 37ef001ba3..4fdb1ad300 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/SoftEdge.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/SoftEdge.h
@@ -70,7 +70,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"rad", rad);
+				XmlMacroReadAttributeBase(node, L"rad", rad);
 			}
 
 			virtual std::wstring toXML() const
@@ -98,4 +98,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SOFTEDGE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SOFTEDGE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/TintEffect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/TintEffect.h
index 3bcc9e3981..d5b6d43491 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/TintEffect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/TintEffect.h
@@ -74,8 +74,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"amt", amt);
-				node.ReadAttributeBase(L"hue", hue);
+                XmlMacroReadAttributeBase(node, L"amt", amt);
+                XmlMacroReadAttributeBase(node, L"hue", hue);
 
 				Normalize();
 			}
@@ -115,4 +115,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TINTEFFECT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TINTEFFECT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h
index a219e647eb..4c0264bff7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h
@@ -83,12 +83,12 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"kx", kx);
-				node.ReadAttributeBase(L"ky", ky);
-				node.ReadAttributeBase(L"sx", sx);
-				node.ReadAttributeBase(L"sy", sy);
-				node.ReadAttributeBase(L"tx", tx);
-				node.ReadAttributeBase(L"ty", ty);
+                XmlMacroReadAttributeBase(node, L"kx", kx);
+                XmlMacroReadAttributeBase(node, L"ky", ky);
+                XmlMacroReadAttributeBase(node, L"sx", sx);
+                XmlMacroReadAttributeBase(node, L"sy", sy);
+                XmlMacroReadAttributeBase(node, L"tx", tx);
+                XmlMacroReadAttributeBase(node, L"ty", ty);
 
 				Normalize();
 			}
@@ -141,4 +141,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_XFRMEFFECT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_XFRMEFFECT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/ExtP.h b/ASCOfficePPTXFile/PPTXFormat/Logic/ExtP.h
index e0516baf4a..8b42e13773 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/ExtP.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/ExtP.h
@@ -180,8 +180,8 @@ namespace PPTX
 							XmlUtils::CXmlNode trim = oNode.ReadNodeNoNS(L"trim");
 							if (trim.IsValid())
 							{
-								trim.ReadAttributeBase(L"st", st);
-								trim.ReadAttributeBase(L"end", end);
+								XmlMacroReadAttributeBase(trim, L"st", st);
+								XmlMacroReadAttributeBase(trim, L"end", end);
 							}
 						}
 						else if (L"compatExt" == strName)
@@ -264,4 +264,4 @@ namespace PPTX
 	} 
 } 
 
-#endif 
\ No newline at end of file
+#endif 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp
index 7af5e62e64..abf46c2844 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp
@@ -67,12 +67,12 @@ namespace PPTX
 		{
 			m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-			node.ReadAttributeBase(L"r:embed", embed);
-			node.ReadAttributeBase(L"r:link", link);
-			node.ReadAttributeBase(L"cstate", cstate);
+            XmlMacroReadAttributeBase(node, L"r:embed", embed);
+            XmlMacroReadAttributeBase(node, L"r:link", link);
+            XmlMacroReadAttributeBase(node, L"cstate", cstate);
 
 			Effects.clear();
-			node.LoadArray(_T("*"), Effects);
+            XmlMacroLoadArray(node, _T("*"), Effects, UniEffect);
 
 			FillParentPointersForChilds();
 		}
@@ -377,4 +377,4 @@ namespace PPTX
 			pReader->Seek(_e2);
 		}
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h
index 58974bdb5e..20d3d8860f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h
@@ -113,8 +113,8 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"dpi", dpi);
-				node.ReadAttributeBase(L"rotWithShape", rotWithShape);
+				XmlMacroReadAttributeBase(node, L"dpi", dpi);
+				XmlMacroReadAttributeBase(node, L"rotWithShape", rotWithShape);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/GradFill.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/GradFill.h
index fe0c139349..2391dfb33e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/GradFill.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/GradFill.h
@@ -121,12 +121,12 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"flip", flip);
-				node.ReadAttributeBase(L"rotWithShape", rotWithShape);
+				XmlMacroReadAttributeBase(node, L"flip", flip);
+				XmlMacroReadAttributeBase(node, L"rotWithShape", rotWithShape);
 
 				XmlUtils::CXmlNode oNode = node.ReadNodeNoNS(_T("gsLst"));
 				if (oNode.IsValid())
-					oNode.LoadArray(_T("*"), GsLst);
+					XmlMacroLoadArray(oNode, _T("*"), GsLst, Gs);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -297,4 +297,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_GRADFILL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_GRADFILL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/PattFill.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/PattFill.h
index bf6dff0f25..0a152d377d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/PattFill.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/PattFill.h
@@ -96,7 +96,7 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"prst", prst);
+				XmlMacroReadAttributeBase(node, L"prst", prst);
 				
 				XmlUtils::CXmlNode oNode;
 				if (node.GetNode(_T("a:fgClr"), oNode))
@@ -173,4 +173,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PATTFILL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_PATTFILL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h
index 6b5bfdb2a4..545de662f9 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h
@@ -84,12 +84,12 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"algn", algn);
-				node.ReadAttributeBase(L"flip", flip);
-				node.ReadAttributeBase(L"sx", sx);
-				node.ReadAttributeBase(L"sy", sy);
-				node.ReadAttributeBase(L"tx", tx);
-				node.ReadAttributeBase(L"ty", ty);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"flip", flip);
+				XmlMacroReadAttributeBase(node, L"sx", sx);
+				XmlMacroReadAttributeBase(node, L"sy", sy);
+				XmlMacroReadAttributeBase(node, L"tx", tx);
+				XmlMacroReadAttributeBase(node, L"ty", ty);
 			}
 			virtual std::wstring toXML() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/FontRef.h b/ASCOfficePPTXFile/PPTXFormat/Logic/FontRef.h
index 8d8b73b9d8..af3f822a6a 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/FontRef.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/FontRef.h
@@ -74,7 +74,7 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"idx", idx);
+				XmlMacroReadAttributeBase(node, L"idx", idx);
 				Color.GetColorFrom(node);
 
 				FillParentPointersForChilds();
@@ -154,4 +154,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SLIDE_FONTREF_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SLIDE_FONTREF_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Gd.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Gd.h
index 9a53644c80..aff937270b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Gd.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Gd.h
@@ -63,8 +63,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"name", name);
-				node.ReadAttributeBase(L"fmla", fmla);
+				XmlMacroReadAttributeBase(node, L"name", name);
+				XmlMacroReadAttributeBase(node, L"fmla", fmla);
 			}
 
 			virtual std::wstring toXML() const
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
index bc1d4ac912..28451c4c49 100755
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
@@ -300,7 +300,7 @@ namespace PPTX
 					}
 					else if (L"legacyDrawing" == strName)
 					{
-						oNode.ReadAttributeBase(L"spid", vmlSpid);
+                        XmlMacroReadAttributeBase(oNode, L"spid", vmlSpid);
 						result = true;
 					}
 					else
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.h
index 31860e6a07..03aefbc544 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.h
@@ -114,7 +114,7 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"bwMode", bwMode);
+				XmlMacroReadAttributeBase(node, L"bwMode", bwMode);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Hf.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Hf.h
index 4c7a1686f1..82afbf4958 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Hf.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Hf.h
@@ -47,10 +47,10 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"dt", dt);
-				node.ReadAttributeBase(L"ftr", ftr);
-				node.ReadAttributeBase(L"hdr", hdr);
-				node.ReadAttributeBase(L"sldNum", sldNum);
+                XmlMacroReadAttributeBase(node, L"dt", dt);
+                XmlMacroReadAttributeBase(node, L"ftr", ftr);
+                XmlMacroReadAttributeBase(node, L"hdr", hdr);
+                XmlMacroReadAttributeBase(node, L"sldNum", sldNum);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -120,4 +120,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_HF_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_HF_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.h
index cac7302ee6..10d6dc6518 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.h
@@ -97,14 +97,14 @@ namespace PPTX
                 std::wstring sSndNodeName = _T("snd");
                 snd	= node.ReadNodeNoNS(sSndNodeName);
 
-				node.ReadAttributeBase(L"r:id", id);
-				node.ReadAttributeBase(L"invalidUrl", invalidUrl);
-				node.ReadAttributeBase(L"action", action);
-				node.ReadAttributeBase(L"tgtFrame", tgtFrame);
-				node.ReadAttributeBase(L"tooltip", tooltip);
-				node.ReadAttributeBase(L"history", history);
-				node.ReadAttributeBase(L"highlightClick", highlightClick);
-				node.ReadAttributeBase(L"endSnd", endSnd);
+				XmlMacroReadAttributeBase(node, L"r:id", id);
+				XmlMacroReadAttributeBase(node, L"invalidUrl", invalidUrl);
+				XmlMacroReadAttributeBase(node, L"action", action);
+				XmlMacroReadAttributeBase(node, L"tgtFrame", tgtFrame);
+				XmlMacroReadAttributeBase(node, L"tooltip", tooltip);
+				XmlMacroReadAttributeBase(node, L"history", history);
+				XmlMacroReadAttributeBase(node, L"highlightClick", highlightClick);
+				XmlMacroReadAttributeBase(node, L"endSnd", endSnd);
 			}
 
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h
index 26caf94b02..d88fd4d59d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h
@@ -65,8 +65,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"ang", ang);
-				node.ReadAttributeBase(L"scaled", scaled);
+				XmlMacroReadAttributeBase(node, L"ang", ang);
+				XmlMacroReadAttributeBase(node, L"scaled", scaled);
 
 				Normalize();
 			}
@@ -143,4 +143,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_LIN_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_LIN_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/LineEnd.h b/ASCOfficePPTXFile/PPTXFormat/Logic/LineEnd.h
index 9da038897d..9893b72a7a 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/LineEnd.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/LineEnd.h
@@ -70,9 +70,9 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 				
-				node.ReadAttributeBase(L"type", type);
-				node.ReadAttributeBase(L"w", w);
-				node.ReadAttributeBase(L"len", len);
+				XmlMacroReadAttributeBase(node, L"type", type);
+				XmlMacroReadAttributeBase(node, L"w", w);
+				XmlMacroReadAttributeBase(node, L"len", len);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -170,4 +170,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_LINEEND_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_LINEEND_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/LineJoin.h b/ASCOfficePPTXFile/PPTXFormat/Logic/LineJoin.h
index 3cd184dca6..ac5cd8e89e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/LineJoin.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/LineJoin.h
@@ -102,7 +102,7 @@ namespace PPTX
 						if (oNode.IsValid())
 						{
 							type = JoinMiter;
-							oNode.ReadAttributeBase(L"lim", lim);
+							XmlMacroReadAttributeBase(oNode, L"lim", lim);
 						}
 					}
 				}
@@ -122,7 +122,7 @@ namespace PPTX
 				else if (name == _T("miter"))
 				{
 					type = JoinMiter;
-					node.ReadAttributeBase(L"lim", lim);
+					XmlMacroReadAttributeBase(node, L"lim", lim);
 				}
 
 				Normalize();
@@ -227,4 +227,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_LINEJOIN_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_LINEJOIN_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h
index dc1bb1f339..bdc20e81d2 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h
@@ -108,10 +108,10 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"algn", algn);
-				node.ReadAttributeBase(L"cap", cap);
-				node.ReadAttributeBase(L"cmpd", cmpd);
-				node.ReadAttributeBase(L"w", w);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"cap", cap);
+				XmlMacroReadAttributeBase(node, L"cmpd", cmpd);
+				XmlMacroReadAttributeBase(node, L"w", w);
 
 				Fill.GetFillFrom(node);
 				prstDash = node.ReadNodeNoNS(_T("prstDash"));
@@ -382,4 +382,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_LN_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_LN_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/AudioCD.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/AudioCD.h
index d3fb62bb4f..8a4535c630 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/AudioCD.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/AudioCD.h
@@ -71,11 +71,11 @@ namespace PPTX
 
 				oMem		= node.ReadNode(_T("a:st"));
 				stTrack		= oMem.ReadAttributeInt(L"track");
-				oMem.ReadAttributeBase(L"time", stTime);
+				XmlMacroReadAttributeBase(oMem, L"time", stTime);
 
 				oMem		= node.ReadNode(_T("a:end"));
 				endTrack	= oMem.ReadAttributeInt(L"track");
-				oMem.ReadAttributeBase(L"time", endTime);
+				XmlMacroReadAttributeBase(oMem, L"time", endTime);
 
 				Normalize();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/MediaFile.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/MediaFile.h
index 46f01ba4b3..8857574a28 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/MediaFile.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/MediaFile.h
@@ -71,7 +71,7 @@ namespace PPTX
 			{
 				name		= XmlUtils::GetNameNoNS(node.GetName());
 				link		= node.GetAttribute(_T("r:link"));
-				node.ReadAttributeBase(L"contentType", contentType);
+				XmlMacroReadAttributeBase(node, L"contentType", contentType);
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -107,4 +107,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_MEDIAFILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_MEDIAFILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/WavAudioFile.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/WavAudioFile.h
index 1669634da7..263bcc4260 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Media/WavAudioFile.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Media/WavAudioFile.h
@@ -81,7 +81,7 @@ namespace PPTX
 				m_name	= XmlUtils::GetNameNoNS(node.GetName());
 
 				embed	= node.GetAttribute(_T("r:embed"));
-				node.ReadAttributeBase(L"name", name);
+				XmlMacroReadAttributeBase(node, L"name", name);
 			}
 
 			virtual std::wstring toXML() const
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/NvPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/NvPr.h
index be7eb51881..4370d73d60 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/NvPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/NvPr.h
@@ -108,8 +108,8 @@ namespace PPTX
 			{
 				m_namespace = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"isPhoto", isPhoto);
-				node.ReadAttributeBase(L"userDrawn", userDrawn);
+				XmlMacroReadAttributeBase(node, L"isPhoto", isPhoto);
+				XmlMacroReadAttributeBase(node, L"userDrawn", userDrawn);
 
 				ph = node.ReadNodeNoNS(_T("ph"));
 				media.GetMediaFrom(node);
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Path.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Path.h
index 74ba382247..79ff675743 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Path.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Path.h
@@ -75,7 +75,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"path", path);
+				XmlMacroReadAttributeBase(node, L"path", path);
 				rect = node.ReadNodeNoNS(_T("fillToRect"));
 				
 				FillParentPointersForChilds();
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Path2D.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Path2D.h
index 3d551fc1ff..ca8cedda5d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Path2D.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Path2D.h
@@ -99,14 +99,14 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"extrusionOk", extrusionOk);
-				node.ReadAttributeBase(L"fill", fill);
-				node.ReadAttributeBase(L"h", h);
-				node.ReadAttributeBase(L"stroke", stroke);
-				node.ReadAttributeBase(L"w", w);
+				XmlMacroReadAttributeBase(node, L"extrusionOk", extrusionOk);
+				XmlMacroReadAttributeBase(node, L"fill", fill);
+				XmlMacroReadAttributeBase(node, L"h", h);
+				XmlMacroReadAttributeBase(node, L"stroke", stroke);
+				XmlMacroReadAttributeBase(node, L"w", w);
 
 				Paths.clear();
-				node.LoadArray(_T("*"), Paths);
+				XmlMacroLoadArray(node, _T("*"), Paths, UniPath2D);
 				
 				FillParentPointersForChilds();
 			}
@@ -344,4 +344,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PATH2D_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_PATH2D_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Ph.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Ph.h
index e6b41d55a4..721b645845 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Ph.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Ph.h
@@ -66,11 +66,11 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"hasCustomPrompt", hasCustomPrompt);
-				node.ReadAttributeBase(L"idx", idx);
-				node.ReadAttributeBase(L"orient", orient);
-				node.ReadAttributeBase(L"sz", sz);
-				node.ReadAttributeBase(L"type", type);
+				XmlMacroReadAttributeBase(node, L"hasCustomPrompt", hasCustomPrompt);
+				XmlMacroReadAttributeBase(node, L"idx", idx);
+				XmlMacroReadAttributeBase(node, L"orient", orient);
+				XmlMacroReadAttributeBase(node, L"sz", sz);
+				XmlMacroReadAttributeBase(node, L"type", type);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -172,4 +172,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PH_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_PH_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
index 0f0b01fcc3..bf0bfba5a4 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
@@ -68,19 +68,19 @@ namespace PPTX
 	{
 		void COLEObject::fromXML(XmlUtils::CXmlNode& node)
 		{
-			node.ReadAttributeBase(L"DrawAspect",	m_oDrawAspect);
-			node.ReadAttributeBase(L"r:id",			m_oId);
-			node.ReadAttributeBase(L"ObjectID",		m_sObjectId);
-			node.ReadAttributeBase(L"ProgID",		m_sProgId);
-			node.ReadAttributeBase(L"ShapeID",		m_sShapeId);
-			node.ReadAttributeBase(L"Type",			m_oType);
-			node.ReadAttributeBase(L"UpdateMode",	m_oUpdateMode);
+            XmlMacroReadAttributeBase(node, L"DrawAspect",	m_oDrawAspect);
+            XmlMacroReadAttributeBase(node, L"r:id",		m_oId);
+            XmlMacroReadAttributeBase(node, L"ObjectID",	m_sObjectId);
+            XmlMacroReadAttributeBase(node, L"ProgID",		m_sProgId);
+            XmlMacroReadAttributeBase(node, L"ShapeID",		m_sShapeId);
+            XmlMacroReadAttributeBase(node, L"Type",		m_oType);
+            XmlMacroReadAttributeBase(node, L"UpdateMode",	m_oUpdateMode);
 
 			std::wstring ole_bin, ole_image, mspackage;
 			
-			node.ReadAttributeBase(L"pathbin", ole_bin);
-			node.ReadAttributeBase(L"pathimg", ole_image);
-			node.ReadAttributeBase(L"mspackage", mspackage);
+            XmlMacroReadAttributeBase(node, L"pathbin", ole_bin);
+            XmlMacroReadAttributeBase(node, L"pathimg", ole_image);
+            XmlMacroReadAttributeBase(node, L"mspackage", mspackage);
 
 			if (m_OleObjectFile.IsInit() == false && !ole_bin.empty())
 			{
@@ -1489,8 +1489,8 @@ namespace PPTX
 		{
 			oleObject.Init();
 			
-			node.ReadAttributeBase(L"progId",	oleObject->m_sProgId);
-			node.ReadAttributeBase(L"r:id",		oleObject->m_oId);
+            XmlMacroReadAttributeBase(node, L"progId",	oleObject->m_sProgId);
+            XmlMacroReadAttributeBase(node, L"r:id",		oleObject->m_oId);
 			
 			int imgW = node.GetAttributeInt(std::wstring(L"imgW"), 0);			
 			if(imgW > 0)
@@ -1509,7 +1509,7 @@ namespace PPTX
 					blipFill.blip.Init();
 				blipFill.blip->oleRid = oleObject->m_oId->get();
 			}
-			node.ReadAttributeBase(L"spid",	oleObject->m_sShapeId);
+            XmlMacroReadAttributeBase(node, L"spid",	oleObject->m_sShapeId);
 		}
 	} // namespace Logic
 } // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstDash.h b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstDash.h
index 509d784072..0fd50c37be 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstDash.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstDash.h
@@ -63,7 +63,7 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"val", val);
+				XmlMacroReadAttributeBase(node, L"val", val);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -134,4 +134,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PRSTDASH_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_PRSTDASH_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstGeom.h b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstGeom.h
index 4cf9b97d6e..43d748f0af 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstGeom.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstGeom.h
@@ -103,8 +103,10 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"prst", prst);
-				node.ReadNode(_T("a:avLst")).LoadArray(_T("a:gd"), avLst);
+				XmlMacroReadAttributeBase(node, L"prst", prst);
+
+				XmlUtils::CXmlNode nodeList = node.ReadNode(_T("a:avLst"));
+				XmlMacroLoadArray(nodeList, _T("a:gd"), avLst, Gd);
 
 				FillParentPointersForChilds();
 			}
@@ -175,4 +177,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PRSTGEOM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_PRSTGEOM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstTxWarp.h b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstTxWarp.h
index 6a4edc9950..233473f436 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/PrstTxWarp.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/PrstTxWarp.h
@@ -101,8 +101,10 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"prst", prst);
-				node.ReadNode(_T("a:avLst")).LoadArray(_T("a:gd"), avLst);
+				XmlMacroReadAttributeBase(node, L"prst", prst);
+
+				XmlUtils::CXmlNode nodeList = node.ReadNode(_T("a:avLst"));
+				XmlMacroLoadArray(nodeList, _T("a:gd"), avLst, Gd);
 
 				FillParentPointersForChilds();
 			}
@@ -199,4 +201,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_PRSTTXWARP_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_PRSTTXWARP_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h
index 394e963f64..fa14b06190 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h
@@ -69,10 +69,10 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"t", t);
-				node.ReadAttributeBase(L"b", b);
-				node.ReadAttributeBase(L"l", l);
-				node.ReadAttributeBase(L"r", r);
+				XmlMacroReadAttributeBase(node, L"t", t);
+				XmlMacroReadAttributeBase(node, L"b", b);
+				XmlMacroReadAttributeBase(node, L"l", l);
+				XmlMacroReadAttributeBase(node, L"r", r);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -182,4 +182,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_RECT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_RECT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h b/ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h
index 25423ed5e9..4d1b871e75 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h
@@ -359,25 +359,25 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"altLang", altLang);
-				node.ReadAttributeBase(L"b", b);
-				node.ReadAttributeBase(L"bmk", bmk);
-				node.ReadAttributeBase(L"cap", cap);
-				node.ReadAttributeBase(L"dirty", dirty);
-				node.ReadAttributeBase(L"err", err);
-				node.ReadAttributeBase(L"i", i);
-				node.ReadAttributeBase(L"kern", kern);
-				node.ReadAttributeBase(L"kumimoji", kumimoji);
-				node.ReadAttributeBase(L"lang", lang);
-				node.ReadAttributeBase(L"noProof", noProof);
-				node.ReadAttributeBase(L"normalizeH", normalizeH);
-				node.ReadAttributeBase(L"smtClean", smtClean);
-				node.ReadAttributeBase(L"smtId", altLang);
-				node.ReadAttributeBase(L"strike", strike);
-				node.ReadAttributeBase(L"sz", sz);
-				node.ReadAttributeBase(L"u", u);
-				node.ReadAttributeBase(L"baseline", baseline);
-				node.ReadAttributeBase(L"spc", spc);
+				XmlMacroReadAttributeBase(node, L"altLang", altLang);
+				XmlMacroReadAttributeBase(node, L"b", b);
+				XmlMacroReadAttributeBase(node, L"bmk", bmk);
+				XmlMacroReadAttributeBase(node, L"cap", cap);
+				XmlMacroReadAttributeBase(node, L"dirty", dirty);
+				XmlMacroReadAttributeBase(node, L"err", err);
+				XmlMacroReadAttributeBase(node, L"i", i);
+				XmlMacroReadAttributeBase(node, L"kern", kern);
+				XmlMacroReadAttributeBase(node, L"kumimoji", kumimoji);
+				XmlMacroReadAttributeBase(node, L"lang", lang);
+				XmlMacroReadAttributeBase(node, L"noProof", noProof);
+				XmlMacroReadAttributeBase(node, L"normalizeH", normalizeH);
+				XmlMacroReadAttributeBase(node, L"smtClean", smtClean);
+				XmlMacroReadAttributeBase(node, L"smtId", altLang);
+				XmlMacroReadAttributeBase(node, L"strike", strike);
+				XmlMacroReadAttributeBase(node, L"sz", sz);
+				XmlMacroReadAttributeBase(node, L"u", u);
+				XmlMacroReadAttributeBase(node, L"baseline", baseline);
+				XmlMacroReadAttributeBase(node, L"spc", spc);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(L"*", oNodes))
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h
index 68973f4497..6a8990c27e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h
@@ -104,7 +104,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				id = node.GetAttribute(_T("id"));
-				node.ReadAttributeBase(L"type", type);
+				XmlMacroReadAttributeBase(node, L"type", type);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
index eaa18f60bd..1c26768cae 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
@@ -149,7 +149,7 @@ namespace PPTX
 		{
 			m_name = node.GetName();
 
-			node.ReadAttributeBase(L"useBgFill", attrUseBgFill);
+            XmlMacroReadAttributeBase(node,L"useBgFill", attrUseBgFill);
 
 			XmlUtils::CXmlNodes oNodes;
 			if (node.GetNodes(_T("*"), oNodes))
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h b/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h
index fb7558170c..283c069ee0 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h
@@ -78,10 +78,10 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"r:dm", id_data);
-				node.ReadAttributeBase(L"r:cs", id_color);
-				node.ReadAttributeBase(L"r:lo", id_layout);
-				node.ReadAttributeBase(L"r:qs", id_style);
+				XmlMacroReadAttributeBase(node, L"r:dm", id_data);
+				XmlMacroReadAttributeBase(node, L"r:cs", id_color);
+				XmlMacroReadAttributeBase(node, L"r:lo", id_layout);
+				XmlMacroReadAttributeBase(node, L"r:qs", id_style);
 				//FillParentPointersForChilds();
 			}
 			virtual std::wstring toXML() const
@@ -161,7 +161,7 @@ namespace PPTX
 			{
 				m_bData = false;
 
-				node.ReadAttributeBase(L"r:id", id_data);
+				XmlMacroReadAttributeBase(node, L"r:id", id_data);
 				FillParentPointersForChilds();
 
 				if (id_data.IsInit())
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Sp3d.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Sp3d.h
index 2166d22c6d..0592985a10 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Sp3d.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Sp3d.h
@@ -100,10 +100,10 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"contourW", contourW);
-				node.ReadAttributeBase(L"extrusionH", extrusionH);
-				node.ReadAttributeBase(L"prstMaterial", prstMaterial);
-				node.ReadAttributeBase(L"z", z);
+				XmlMacroReadAttributeBase(node, L"contourW", contourW);
+				XmlMacroReadAttributeBase(node, L"extrusionH", extrusionH);
+				XmlMacroReadAttributeBase(node, L"prstMaterial", prstMaterial);
+				XmlMacroReadAttributeBase(node, L"z", z);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -281,4 +281,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SP3D_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SP3D_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp
index 610ccdb2c0..bb200c7c77 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp
@@ -119,7 +119,7 @@ namespace PPTX
 			Fill.GetFillFrom(node);
 			EffectList.GetEffectListFrom(node);
 
-			node.ReadAttributeBase(L"bwMode", bwMode);
+            XmlMacroReadAttributeBase(node,L"bwMode", bwMode);
 
 			XmlUtils::CXmlNodes oNodes;
 			if (node.GetNodes(_T("*"), oNodes))
@@ -263,4 +263,4 @@ namespace PPTX
 			pReader->Seek(_end_rec);
 		}
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/StyleRef.h b/ASCOfficePPTXFile/PPTXFormat/Logic/StyleRef.h
index 8fa7f5a1e6..94ccc4827c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/StyleRef.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/StyleRef.h
@@ -75,7 +75,7 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"idx", idx);
+				XmlMacroReadAttributeBase(node, L"idx", idx);
 				Color.GetColorFrom(node);
 				FillParentPointersForChilds();
 			}
@@ -162,4 +162,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SLIDE_STYLEREF_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SLIDE_STYLEREF_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/SupplementalFont.h b/ASCOfficePPTXFile/PPTXFormat/Logic/SupplementalFont.h
index 4417229440..bb5419c558 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/SupplementalFont.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/SupplementalFont.h
@@ -50,8 +50,8 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"script", script);
-				node.ReadAttributeBase(L"typeface", typeface);
+				XmlMacroReadAttributeBase(node, L"script", script);
+				XmlMacroReadAttributeBase(node, L"typeface", typeface);
 			}
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
@@ -118,4 +118,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SUPPLEMENTALFONT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SUPPLEMENTALFONT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Tab.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Tab.h
index 5230e91f0a..ef90cf03ee 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Tab.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Tab.h
@@ -70,8 +70,8 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"pos", pos);
-				node.ReadAttributeBase(L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"pos", pos);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
 
 				FillParentPointersForChilds();
 			}
@@ -105,4 +105,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TAB_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_TAB_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h
index 2318485a52..cfc4c9cd2e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h
@@ -66,9 +66,9 @@ namespace PPTX
 			{
 				XmlUtils::CXmlNode oNode;
 				if (node.GetNode(_T("a:tblGrid"), oNode))
-					oNode.LoadArray(_T("a:gridCol"), TableCols);
+					XmlMacroLoadArray(oNode, _T("a:gridCol"), TableCols, TableCol);
 
-				node.LoadArray(_T("a:tr"), TableRows);
+				XmlMacroLoadArray(node, _T("a:tr"), TableRows, TableRow);
 
                 tableProperties = node.ReadNode(_T("a:tblPr"));
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
index 831039ea62..9f8786ceb7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp
@@ -97,11 +97,11 @@ namespace PPTX
             txBody			= node.ReadNodeNoNS(_T("txBody"));
 			CellProperties	= node.ReadNode(_T("a:tcPr"));
 
-			node.ReadAttributeBase(L"rowSpan", RowSpan);
-			node.ReadAttributeBase(L"gridSpan", GridSpan);
-			node.ReadAttributeBase(L"hMerge", HMerge);
-			node.ReadAttributeBase(L"vMerge", VMerge);
-			node.ReadAttributeBase(L"id", Id);
+            XmlMacroReadAttributeBase(node, L"rowSpan", RowSpan);
+            XmlMacroReadAttributeBase(node, L"gridSpan", GridSpan);
+            XmlMacroReadAttributeBase(node, L"hMerge", HMerge);
+            XmlMacroReadAttributeBase(node, L"vMerge", VMerge);
+            XmlMacroReadAttributeBase(node, L"id", Id);
 
 			FillParentPointersForChilds();
 		}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCellProperties.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCellProperties.h
index 059f1d9b79..6b6c2af034 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCellProperties.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCellProperties.h
@@ -143,14 +143,14 @@ namespace PPTX
 				Fill.GetFillFrom(node);
 	//			<xsd:element name="headers" type="CT_Headers" minOccurs="0"/> 
 
-				node.ReadAttributeBase(L"marL", MarL);
-				node.ReadAttributeBase(L"marR", MarR);
-				node.ReadAttributeBase(L"marT", MarT);
-				node.ReadAttributeBase(L"marB", MarB);
-				node.ReadAttributeBase(L"vert", Vert);
-				node.ReadAttributeBase(L"anchor", Anchor);
-				node.ReadAttributeBase(L"anchorCtr", AnchorCtr);
-				node.ReadAttributeBase(L"horzOverflow", HorzOverflow);
+				XmlMacroReadAttributeBase(node, L"marL", MarL);
+				XmlMacroReadAttributeBase(node, L"marR", MarR);
+				XmlMacroReadAttributeBase(node, L"marT", MarT);
+				XmlMacroReadAttributeBase(node, L"marB", MarB);
+				XmlMacroReadAttributeBase(node, L"vert", Vert);
+				XmlMacroReadAttributeBase(node, L"anchor", Anchor);
+				XmlMacroReadAttributeBase(node, L"anchorCtr", AnchorCtr);
+				XmlMacroReadAttributeBase(node, L"horzOverflow", HorzOverflow);
 
 				FillParentPointersForChilds();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableProperties.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableProperties.h
index 3336333eb4..b894bfc30f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableProperties.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableProperties.h
@@ -124,13 +124,13 @@ namespace PPTX
 				if (node.GetNode(_T("a:tableStyleId"), oNode))
 					TableStyleId = oNode.GetTextExt();
 
-				node.ReadAttributeBase(L"rtl", Rtl);
-				node.ReadAttributeBase(L"firstRow", FirstRow);
-				node.ReadAttributeBase(L"firstCol", FirstCol);
-				node.ReadAttributeBase(L"lastRow", LastRow);
-				node.ReadAttributeBase(L"lastCol", LastCol);
-				node.ReadAttributeBase(L"bandRow", BandRow);
-				node.ReadAttributeBase(L"bandCol", BandCol);
+				XmlMacroReadAttributeBase(node, L"rtl", Rtl);
+				XmlMacroReadAttributeBase(node, L"firstRow", FirstRow);
+				XmlMacroReadAttributeBase(node, L"firstCol", FirstCol);
+				XmlMacroReadAttributeBase(node, L"lastRow", LastRow);
+				XmlMacroReadAttributeBase(node, L"lastCol", LastCol);
+				XmlMacroReadAttributeBase(node, L"bandRow", BandRow);
+				XmlMacroReadAttributeBase(node, L"bandCol", BandCol);
 
 				FillParentPointersForChilds();
 			}
@@ -289,4 +289,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TABLE_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TABLE_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableRow.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableRow.h
index eba3994315..b95a97573c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableRow.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableRow.h
@@ -89,7 +89,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				Height = node.ReadAttributeInt(L"h");
-				node.LoadArray(_T("a:tc"), Cells);
+				XmlMacroLoadArray(node, _T("a:tc"), Cells, TableCell);
 			}
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
@@ -177,4 +177,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TABLEROW_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TABLEROW_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TableStyle.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TableStyle.h
index b305f1dc33..fc77e7cc1f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TableStyle.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TableStyle.h
@@ -52,8 +52,8 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"styleId", styleId);
-				node.ReadAttributeBase(L"styleName", styleName);
+                XmlMacroReadAttributeBase(node, L"styleId", styleId);
+                XmlMacroReadAttributeBase(node, L"styleName", styleName);
 
 				tblBg		= node.ReadNode(_T("a:tblBg"));
 				wholeTbl	= node.ReadNode(_T("a:wholeTbl"));
@@ -360,4 +360,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TABLESTYLE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_TABLESTYLE_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TcTxStyle.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TcTxStyle.h
index 40c3a64dff..b23ed33daf 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TcTxStyle.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TcTxStyle.h
@@ -50,8 +50,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"i", i);
-				node.ReadAttributeBase(L"b", b);
+                XmlMacroReadAttributeBase(node, L"i", i);
+                XmlMacroReadAttributeBase(node, L"b", b);
 
                 fontRef = node.ReadNodeNoNS(_T("fontRef"));
 				Color.GetColorFrom(node);
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h
index d9f6dffe25..cb7ab5d109 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h
@@ -68,8 +68,8 @@ namespace PPTX
 					nullable_string sFontScale;
 					nullable_string sLnSpcRed;
 
-					oNode.ReadAttributeBase(L"fontScale", sFontScale);
-					oNode.ReadAttributeBase(L"lnSpcReduction", sLnSpcRed);
+					XmlMacroReadAttributeBase(oNode, L"fontScale", sFontScale);
+					XmlMacroReadAttributeBase(oNode, L"lnSpcReduction", sLnSpcRed);
 
 					if (sFontScale.is_init())
 					{
@@ -149,8 +149,8 @@ namespace PPTX
 					nullable_string sFontScale;
 					nullable_string sLnSpcRed;
 
-					node.ReadAttributeBase(L"fontScale", sFontScale);
-					node.ReadAttributeBase(L"lnSpcReduction", sLnSpcRed);
+					XmlMacroReadAttributeBase(node, L"fontScale", sFontScale);
+					XmlMacroReadAttributeBase(node, L"lnSpcReduction", sLnSpcRed);
 
 					Normalize(sFontScale, sLnSpcRed);
 				}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
index 2558ad36d3..9b68f0df57 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
@@ -63,9 +63,9 @@ namespace PPTX
 				else if ( _T("a:sym") == m_name )
 					m_eType = OOX::et_a_sym;
 
-				node.ReadAttributeBase(L"charset", charset);
-				node.ReadAttributeBase(L"panose", panose);
-				node.ReadAttributeBase(L"pitchFamily", pitchFamily);
+				XmlMacroReadAttributeBase(node, L"charset", charset);
+				XmlMacroReadAttributeBase(node, L"panose", panose);
+				XmlMacroReadAttributeBase(node, L"pitchFamily", pitchFamily);
 
 				typeface = node.GetAttribute(_T("typeface"));
 			}
@@ -250,4 +250,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TEXTFONT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TEXTFONT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TextParagraphPr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TextParagraphPr.h
index e5e08a51bb..4ab6100bbf 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextParagraphPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextParagraphPr.h
@@ -136,17 +136,17 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"algn", algn);
-				node.ReadAttributeBase(L"defTabSz", defTabSz);
-				node.ReadAttributeBase(L"eaLnBrk", eaLnBrk);
-				node.ReadAttributeBase(L"fontAlgn", fontAlgn);
-				node.ReadAttributeBase(L"hangingPunct", hangingPunct);
-				node.ReadAttributeBase(L"indent", indent);
-				node.ReadAttributeBase(L"latinLnBrk", latinLnBrk);
-				node.ReadAttributeBase(L"lvl", lvl);
-				node.ReadAttributeBase(L"marL", marL);
-				node.ReadAttributeBase(L"marR", marR);
-				node.ReadAttributeBase(L"rtl", rtl);
+				XmlMacroReadAttributeBase(node, L"algn", algn);
+				XmlMacroReadAttributeBase(node, L"defTabSz", defTabSz);
+				XmlMacroReadAttributeBase(node, L"eaLnBrk", eaLnBrk);
+				XmlMacroReadAttributeBase(node, L"fontAlgn", fontAlgn);
+				XmlMacroReadAttributeBase(node, L"hangingPunct", hangingPunct);
+				XmlMacroReadAttributeBase(node, L"indent", indent);
+				XmlMacroReadAttributeBase(node, L"latinLnBrk", latinLnBrk);
+				XmlMacroReadAttributeBase(node, L"lvl", lvl);
+				XmlMacroReadAttributeBase(node, L"marL", marL);
+				XmlMacroReadAttributeBase(node, L"marR", marR);
+				XmlMacroReadAttributeBase(node, L"rtl", rtl);
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -168,7 +168,7 @@ namespace PPTX
 						else if (_T("defRPr") == strName)
 							defRPr = oNode;
 						else if (_T("tabLst") == strName)
-							oNode.LoadArray(_T("a:tab"), tabLst);
+							XmlMacroLoadArray(oNode, _T("a:tab"), tabLst, Tab);
 					}
 				}
 				
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TextSpacing.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TextSpacing.h
index 6675e7c016..4b6ec8570c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextSpacing.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextSpacing.h
@@ -86,8 +86,11 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadNode(_T("a:spcPct")).ReadAttributeBase(L"val", spcPct);
-				node.ReadNode(_T("a:spcPts")).ReadAttributeBase(L"val", spcPts);
+				XmlUtils::CXmlNode node1 = node.ReadNode(_T("a:spcPct"));
+				XmlMacroReadAttributeBase(node1, L"val", spcPct);
+
+				XmlUtils::CXmlNode node2 = node.ReadNode(_T("a:spcPts"));
+				XmlMacroReadAttributeBase(node2, L"val", spcPts);
 
 				Normalize();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Anim.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Anim.h
index bec8979e28..e5f90a8c0d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Anim.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Anim.h
@@ -51,11 +51,11 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"by", by);
-				node.ReadAttributeBase(L"from", from);
-				node.ReadAttributeBase(L"to", to);
-				node.ReadAttributeBase(L"calcmode", calcmode);
-				node.ReadAttributeBase(L"valueType", valueType);
+                XmlMacroReadAttributeBase(node, L"by", by);
+                XmlMacroReadAttributeBase(node, L"from", from);
+                XmlMacroReadAttributeBase(node, L"to", to);
+                XmlMacroReadAttributeBase(node, L"calcmode", calcmode);
+                XmlMacroReadAttributeBase(node, L"valueType", valueType);
 
 				cBhvr		= node.ReadNode(_T("p:cBhvr"));
 				tavLst		= node.ReadNode(_T("p:tavLst"));
@@ -99,4 +99,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimClr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimClr.h
index ace65ea107..3e53ae3f77 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimClr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimClr.h
@@ -51,8 +51,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"clrSpc", clrSpc);
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"clrSpc", clrSpc);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 
 				cBhvr	= node.ReadNode(_T("cBhvr"));
 
@@ -71,15 +71,15 @@ namespace PPTX
 					XmlUtils::CXmlNode oHSL;
 					if (oNodeBy.GetNode(_T("p:rgb"), oRGB))
 					{
-						oRGB.ReadAttributeBase(L"r", byR);
-						oRGB.ReadAttributeBase(L"g", byG);
-						oRGB.ReadAttributeBase(L"b", byB);
+                        XmlMacroReadAttributeBase(oRGB, L"r", byR);
+                        XmlMacroReadAttributeBase(oRGB, L"g", byG);
+                        XmlMacroReadAttributeBase(oRGB, L"b", byB);
 					}
-					else if (oNodeBy.GetNode(_T("p:hsl"), oRGB))
+                    else if (oNodeBy.GetNode(_T("p:hsl"), oHSL))
 					{
-						oHSL.ReadAttributeBase(L"h", byH);
-						oHSL.ReadAttributeBase(L"s", byS);
-						oHSL.ReadAttributeBase(L"l", byL);
+                        XmlMacroReadAttributeBase(oHSL, L"h", byH);
+                        XmlMacroReadAttributeBase(oHSL, L"s", byS);
+                        XmlMacroReadAttributeBase(oHSL, L"l", byL);
 					}
 				}
 
@@ -147,4 +147,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMCLR_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMCLR_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimEffect.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimEffect.h
index 0ee6cecca2..b2a40c4fa7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimEffect.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimEffect.h
@@ -50,9 +50,9 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"filter", filter);
-				node.ReadAttributeBase(L"prLst", prLst);
-				node.ReadAttributeBase(L"transition", transition);
+                XmlMacroReadAttributeBase(node, L"filter", filter);
+                XmlMacroReadAttributeBase(node, L"prLst", prLst);
+                XmlMacroReadAttributeBase(node, L"transition", transition);
 
 				cBhvr		= node.ReadNode(_T("p:cBhvr"));
 				progress	= node.ReadNodeNoNS(_T("progress"));
@@ -92,4 +92,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMEFFECT_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMEFFECT_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimMotion.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimMotion.h
index 2f09903d11..eac91daee6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimMotion.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimMotion.h
@@ -55,33 +55,33 @@ namespace PPTX
 				XmlUtils::CXmlNode oNodeBy;
 				if (node.GetNode(_T("p:by"), oNodeBy))
 				{
-					oNodeBy.ReadAttributeBase(L"x", byX);
-					oNodeBy.ReadAttributeBase(L"y", byY);
+                    XmlMacroReadAttributeBase(oNodeBy, L"x", byX);
+                    XmlMacroReadAttributeBase(oNodeBy, L"y", byY);
 				}
 				XmlUtils::CXmlNode oNodeFrom;
 				if (node.GetNode(_T("p:from"), oNodeFrom))
 				{
-					oNodeFrom.ReadAttributeBase(L"x", fromX);
-					oNodeFrom.ReadAttributeBase(L"y", fromY);
+                    XmlMacroReadAttributeBase(oNodeFrom, L"x", fromX);
+                    XmlMacroReadAttributeBase(oNodeFrom, L"y", fromY);
 				}
 				XmlUtils::CXmlNode oNodeTo;
 				if (node.GetNode(_T("p:to"), oNodeTo))
 				{
-					oNodeTo.ReadAttributeBase(L"x", toX);
-					oNodeTo.ReadAttributeBase(L"y", toY);
+                    XmlMacroReadAttributeBase(oNodeTo, L"x", toX);
+                    XmlMacroReadAttributeBase(oNodeTo, L"y", toY);
 				}
 				XmlUtils::CXmlNode oNodeCtr;
 				if (node.GetNode(_T("p:rCtr"), oNodeCtr))
-				{
-					oNodeCtr.ReadAttributeBase(L"x", rCtrX);
-					oNodeCtr.ReadAttributeBase(L"y", rCtrY);
+                {
+                    XmlMacroReadAttributeBase(oNodeCtr, L"x", rCtrX);
+                    XmlMacroReadAttributeBase(oNodeCtr, L"y", rCtrY);
 				}
 
-				node.ReadAttributeBase(L"path", path);
-				node.ReadAttributeBase(L"ptsTypes", ptsTypes);
-				node.ReadAttributeBase(L"rAng", rAng);
-				node.ReadAttributeBase(L"origin", origin);
-				node.ReadAttributeBase(L"pathEditMode", pathEditMode);
+                XmlMacroReadAttributeBase(node, L"path", path);
+                XmlMacroReadAttributeBase(node, L"ptsTypes", ptsTypes);
+                XmlMacroReadAttributeBase(node, L"rAng", rAng);
+                XmlMacroReadAttributeBase(node, L"origin", origin);
+                XmlMacroReadAttributeBase(node, L"pathEditMode", pathEditMode);
 
 				FillParentPointersForChilds();
 			}
@@ -166,4 +166,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMMOTION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMMOTION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimRot.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimRot.h
index 72cfe12847..6c856bc702 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimRot.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimRot.h
@@ -50,9 +50,9 @@ namespace PPTX
 			{
 				cBhvr	= node.ReadNode(_T("p:cBhvr"));
 
-				node.ReadAttributeBase(L"by", by);
-				node.ReadAttributeBase(L"from", from);
-				node.ReadAttributeBase(L"to", to);
+                XmlMacroReadAttributeBase(node, L"by", by);
+                XmlMacroReadAttributeBase(node, L"from", from);
+                XmlMacroReadAttributeBase(node, L"to", to);
 
 				FillParentPointersForChilds();
 			}
@@ -85,4 +85,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMROT_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMROT_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimScale.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimScale.h
index 98ae6e0a0f..6690b39d87 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimScale.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimScale.h
@@ -53,23 +53,23 @@ namespace PPTX
 				XmlUtils::CXmlNode oNodeBy;
 				if (node.GetNode(_T("p:by"), oNodeBy))
 				{
-					oNodeBy.ReadAttributeBase(L"x", byX);
-					oNodeBy.ReadAttributeBase(L"y", byY);
+                    XmlMacroReadAttributeBase(oNodeBy, L"x", byX);
+                    XmlMacroReadAttributeBase(oNodeBy, L"y", byY);
 				}
 				XmlUtils::CXmlNode oNodeFrom;
 				if (node.GetNode(_T("p:from"), oNodeFrom))
 				{
-					oNodeFrom.ReadAttributeBase(L"x", fromX);
-					oNodeFrom.ReadAttributeBase(L"y", fromY);
+                    XmlMacroReadAttributeBase(oNodeFrom, L"x", fromX);
+                    XmlMacroReadAttributeBase(oNodeFrom, L"y", fromY);
 				}
 				XmlUtils::CXmlNode oNodeTo;
 				if (node.GetNode(_T("p:to"), oNodeTo))
 				{
-					oNodeTo.ReadAttributeBase(L"x", toX);
-					oNodeTo.ReadAttributeBase(L"y", toY);
+                    XmlMacroReadAttributeBase(oNodeTo, L"x", toX);
+                    XmlMacroReadAttributeBase(oNodeTo, L"y", toY);
 				}
 
-				node.ReadAttributeBase(L"zoomContents", zoomContents);
+                XmlMacroReadAttributeBase(node, L"zoomContents", zoomContents);
 
 				FillParentPointersForChilds();
 			}
@@ -130,4 +130,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMSCALE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMSCALE_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimVariant.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimVariant.h
index 34a112aa03..01a710a58f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimVariant.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AnimVariant.h
@@ -53,15 +53,15 @@ namespace PPTX
 				XmlUtils::CXmlNode oNode;
 
 				if (node.GetNode(_T("p:boolVal"), oNode))
-					oNode.ReadAttributeBase(L"val", boolVal);
+                    XmlMacroReadAttributeBase(oNode, L"val", boolVal)
 				else if (node.GetNode(_T("p:intVal"), oNode))
-					oNode.ReadAttributeBase(L"val", intVal);
+                    XmlMacroReadAttributeBase(oNode, L"val", intVal)
 				else if (node.GetNode(_T("p:fltVal"), oNode))
-					oNode.ReadAttributeBase(L"val", fltVal);
+                    XmlMacroReadAttributeBase(oNode, L"val", fltVal)
 				else if (node.GetNode(_T("p:clrVal"), oNode))
 					clrVal.GetColorFrom(oNode);
 				else if (node.GetNode(_T("p:strVal"), oNode))
-					oNode.ReadAttributeBase(L"val", strVal);
+                    XmlMacroReadAttributeBase(oNode, L"val", strVal)
 
 				FillParentPointersForChilds();
 			}
@@ -119,4 +119,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ANIMVARIANT_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_ANIMVARIANT_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AttrNameLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AttrNameLst.h
index 32ed3e053c..a83a72d4ec 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AttrNameLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/AttrNameLst.h
@@ -57,7 +57,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.LoadArray(_T("p:attrName"), list);
+                XmlMacroLoadArray(node, _T("p:attrName"), list, AttrName);
 				FillParentPointersForChilds();
 			}
 
@@ -76,4 +76,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ATTRNAMELST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_ATTRNAMELST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Audio.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Audio.h
index 3ca705628f..84862f6fb1 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Audio.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Audio.h
@@ -48,7 +48,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"isNarration", isNarration);
+                XmlMacroReadAttributeBase(node, L"isNarration", isNarration);
 				cMediaNode	= node.ReadNode(_T("p:cMediaNode"));
 
 				FillParentPointersForChilds();
@@ -74,4 +74,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_AUDIO_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_AUDIO_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldDgm.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldDgm.h
index ba7a885efe..76b17211ac 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldDgm.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldDgm.h
@@ -48,10 +48,10 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"spid", spid);
+                XmlMacroReadAttributeBase(node, L"spid", spid);
 				grpId = node.ReadAttributeInt(L"grpId");
-				node.ReadAttributeBase(L"uiExpand", uiExpand);
-				node.ReadAttributeBase(L"bld", bld);
+                XmlMacroReadAttributeBase(node, L"uiExpand", uiExpand);
+                XmlMacroReadAttributeBase(node, L"bld", bld);
 
 				Normalize();
 
@@ -86,4 +86,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDDGM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDDGM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldGraphic.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldGraphic.h
index 972b28793d..affa06e3b8 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldGraphic.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldGraphic.h
@@ -49,9 +49,9 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				bldSub		= node.ReadNode(_T("p:bldSub"));
-				node.ReadAttributeBase(L"spid", spid);
+                XmlMacroReadAttributeBase(node, L"spid", spid);
 				grpId = node.ReadAttributeInt(L"grpId");
-				node.ReadAttributeBase(L"uiExpand", uiExpand);
+                XmlMacroReadAttributeBase(node, L"uiExpand", uiExpand);
 
 				Normalize();
 
@@ -93,4 +93,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDGRAPHIC_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDGRAPHIC_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldLst.h
index 280185b9c0..195e691444 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldLst.h
@@ -57,7 +57,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.LoadArray(_T("*"), list);
+                XmlMacroLoadArray(node,_T("*"), list, BuildNodeBase);
 				FillParentPointersForChilds();
 			}
 
@@ -80,4 +80,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDLST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDLST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldOleChart.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldOleChart.h
index b284c8048f..bf36f3fa37 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldOleChart.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldOleChart.h
@@ -50,9 +50,9 @@ namespace PPTX
 			{
 				spid		= node.GetAttribute(_T("spid"));
 				grpId		= node.ReadAttributeInt(L"grpId");
-				node.ReadAttributeBase(L"uiExpand", uiExpand);
-				node.ReadAttributeBase(L"bld", bld);
-				node.ReadAttributeBase(L"animBg", animBg);
+                XmlMacroReadAttributeBase(node, L"uiExpand", uiExpand);
+                XmlMacroReadAttributeBase(node, L"bld", bld);
+                XmlMacroReadAttributeBase(node, L"animBg", animBg);
 
 				Normalize();
 
@@ -89,4 +89,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDOLECHART_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDOLECHART_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldP.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldP.h
index fd2d0dfd50..b6f646950a 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldP.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldP.h
@@ -53,13 +53,13 @@ namespace PPTX
 
 				spid				= node.GetAttribute(_T("spid"));
 				grpId				= node.ReadAttributeInt(L"grpId");
-				node.ReadAttributeBase(L"uiExpand", uiExpand);
-				node.ReadAttributeBase(L"build", build);
-				node.ReadAttributeBase(L"bldLvl", bldLvl);
-				node.ReadAttributeBase(L"animBg", animBg);
-				node.ReadAttributeBase(L"autoUpdateAnimBg", autoUpdateAnimBg);
-				node.ReadAttributeBase(L"rev", rev);
-				node.ReadAttributeBase(L"advAuto", advAuto);
+                XmlMacroReadAttributeBase(node, L"uiExpand", uiExpand);
+                XmlMacroReadAttributeBase(node, L"build", build);
+                XmlMacroReadAttributeBase(node, L"bldLvl", bldLvl);
+                XmlMacroReadAttributeBase(node, L"animBg", animBg);
+                XmlMacroReadAttributeBase(node, L"autoUpdateAnimBg", autoUpdateAnimBg);
+                XmlMacroReadAttributeBase(node, L"rev", rev);
+                XmlMacroReadAttributeBase(node, L"advAuto", advAuto);
 
 				Normalize();
 
@@ -118,4 +118,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDP_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDP_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldSub.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldSub.h
index 3646d3ecf7..5685e27e8b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldSub.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BldSub.h
@@ -53,14 +53,14 @@ namespace PPTX
 				if (node.GetNode(_T("a:bldChart"), oNode))
 				{
 					chart		= true;
-					oNode.ReadAttributeBase(L"bld", bldChart);
-					oNode.ReadAttributeBase(L"animBg", animBg);
+                    XmlMacroReadAttributeBase(oNode, L"bld", bldChart);
+                    XmlMacroReadAttributeBase(oNode, L"animBg", animBg);
 				}
 				else if (node.GetNode(_T("a:bldDgm"), oNode))
 				{
 					chart		= false;
-					oNode.ReadAttributeBase(L"bld", bldDgm);
-					oNode.ReadAttributeBase(L"rev", rev);
+                    XmlMacroReadAttributeBase(oNode, L"bld", bldDgm);
+                    XmlMacroReadAttributeBase(oNode, L"rev", rev);
 				}
 				else
 					chart.reset();
@@ -104,4 +104,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_BLDSUB_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_BLDSUB_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CBhvr.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CBhvr.h
index bf18b813ec..9dd1f99111 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CBhvr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CBhvr.h
@@ -54,14 +54,14 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"accumulate", accumulate);
-				node.ReadAttributeBase(L"additive", additive);
-				node.ReadAttributeBase(L"by", by);
-				node.ReadAttributeBase(L"from", from);
-				node.ReadAttributeBase(L"override", override_);
-				node.ReadAttributeBase(L"rctx", rctx);
-				node.ReadAttributeBase(L"to", to);
-				node.ReadAttributeBase(L"xfrmType", xfrmType);
+                XmlMacroReadAttributeBase(node, L"accumulate", accumulate);
+                XmlMacroReadAttributeBase(node, L"additive", additive);
+                XmlMacroReadAttributeBase(node, L"by", by);
+                XmlMacroReadAttributeBase(node, L"from", from);
+                XmlMacroReadAttributeBase(node, L"override", override_);
+                XmlMacroReadAttributeBase(node, L"rctx", rctx);
+                XmlMacroReadAttributeBase(node, L"to", to);
+                XmlMacroReadAttributeBase(node, L"xfrmType", xfrmType);
 
 				cTn			= node.ReadNode(_T("p:cTn"));
 				tgtEl		= node.ReadNode(_T("p:tgtEl"));
@@ -115,4 +115,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CBHVR_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CBHVR_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CMediaNode.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CMediaNode.h
index 73ff251423..e9e8cc35fb 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CMediaNode.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CMediaNode.h
@@ -52,10 +52,10 @@ namespace PPTX
 				cTn			= node.ReadNode(_T("p:cTn"));
 				tgtEl		= node.ReadNode(_T("p:tgtEl"));
 
-				node.ReadAttributeBase(L"mute", mute);
-				node.ReadAttributeBase(L"numSld", numSld);
-				node.ReadAttributeBase(L"showWhenStopped", showWhenStopped);
-				node.ReadAttributeBase(L"vol", vol);
+                XmlMacroReadAttributeBase(node, L"mute", mute);
+                XmlMacroReadAttributeBase(node, L"numSld", numSld);
+                XmlMacroReadAttributeBase(node, L"showWhenStopped", showWhenStopped);
+                XmlMacroReadAttributeBase(node, L"vol", vol);
 
 				Normalize();
 
@@ -100,4 +100,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CMEDIANODE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CMEDIANODE_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CTn.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CTn.h
index 1446f42d79..0b1fd5ce7b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CTn.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CTn.h
@@ -57,29 +57,29 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"accel", accel);
-				node.ReadAttributeBase(L"afterEffect", afterEffect);
-				node.ReadAttributeBase(L"autoRev", autoRev);
-				node.ReadAttributeBase(L"bldLvl", bldLvl);
-				node.ReadAttributeBase(L"decel", decel);
-				node.ReadAttributeBase(L"display", display);
-				node.ReadAttributeBase(L"dur", dur);
-				node.ReadAttributeBase(L"evtFilter", evtFilter);
-				node.ReadAttributeBase(L"fill", fill);
-				node.ReadAttributeBase(L"grpId", grpId);
-				node.ReadAttributeBase(L"id", id);
-				node.ReadAttributeBase(L"masterRel", masterRel);
-				node.ReadAttributeBase(L"nodePh", nodePh);
-				node.ReadAttributeBase(L"nodeType", nodeType);
-				node.ReadAttributeBase(L"presetClass", presetClass);
-				node.ReadAttributeBase(L"presetID", presetID);
-				node.ReadAttributeBase(L"presetSubtype", presetSubtype);
-				node.ReadAttributeBase(L"repeatCount", repeatCount);
-				node.ReadAttributeBase(L"repeatDur", repeatDur);
-				node.ReadAttributeBase(L"restart", restart);
-				node.ReadAttributeBase(L"spd", spd);
-				node.ReadAttributeBase(L"syncBehavior", syncBehavior);
-				node.ReadAttributeBase(L"tmFilter", tmFilter);
+                XmlMacroReadAttributeBase(node, L"accel", accel);
+                XmlMacroReadAttributeBase(node, L"afterEffect", afterEffect);
+                XmlMacroReadAttributeBase(node, L"autoRev", autoRev);
+                XmlMacroReadAttributeBase(node, L"bldLvl", bldLvl);
+                XmlMacroReadAttributeBase(node, L"decel", decel);
+                XmlMacroReadAttributeBase(node, L"display", display);
+                XmlMacroReadAttributeBase(node, L"dur", dur);
+                XmlMacroReadAttributeBase(node, L"evtFilter", evtFilter);
+                XmlMacroReadAttributeBase(node, L"fill", fill);
+                XmlMacroReadAttributeBase(node, L"grpId", grpId);
+                XmlMacroReadAttributeBase(node, L"id", id);
+                XmlMacroReadAttributeBase(node, L"masterRel", masterRel);
+                XmlMacroReadAttributeBase(node, L"nodePh", nodePh);
+                XmlMacroReadAttributeBase(node, L"nodeType", nodeType);
+                XmlMacroReadAttributeBase(node, L"presetClass", presetClass);
+                XmlMacroReadAttributeBase(node, L"presetID", presetID);
+                XmlMacroReadAttributeBase(node, L"presetSubtype", presetSubtype);
+                XmlMacroReadAttributeBase(node, L"repeatCount", repeatCount);
+                XmlMacroReadAttributeBase(node, L"repeatDur", repeatDur);
+                XmlMacroReadAttributeBase(node, L"restart", restart);
+                XmlMacroReadAttributeBase(node, L"spd", spd);
+                XmlMacroReadAttributeBase(node, L"syncBehavior", syncBehavior);
+                XmlMacroReadAttributeBase(node, L"tmFilter", tmFilter);
 
 				stCondLst	= node.ReadNode(_T("p:stCondLst"));
 				endCondLst	= node.ReadNode(_T("p:endCondLst"));
@@ -193,4 +193,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CTN_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CTN_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cmd.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cmd.h
index 6d74c61d48..f0e993aff0 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cmd.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cmd.h
@@ -49,8 +49,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"type", type);
-				node.ReadAttributeBase(L"cmd", cmd);
+                XmlMacroReadAttributeBase(node, L"type", type);
+                XmlMacroReadAttributeBase(node, L"cmd", cmd);
 
 				cBhvr	= node.ReadNode(_T("p:cBhvr"));
 
@@ -80,4 +80,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CMD_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CMD_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cond.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cond.h
index 6d4a9ccaf1..8437623f4f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cond.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Cond.h
@@ -52,14 +52,14 @@ namespace PPTX
 			{
 				name	= XmlUtils::GetNameNoNS(node.GetName());
 		
-				node.ReadAttributeBase(L"delay", delay);
-				node.ReadAttributeBase(L"evt", evt);
+                XmlMacroReadAttributeBase(node, L"delay", delay);
+                XmlMacroReadAttributeBase(node, L"evt", evt);
 
 				XmlUtils::CXmlNode oNode;
 				if (node.GetNode(_T("p:tn"), oNode))
-					oNode.ReadAttributeBase(L"val", tn);
+                    XmlMacroReadAttributeBase(oNode, L"val", tn)
 				else if (node.GetNode(_T("p:rtn"), oNode))
-					oNode.ReadAttributeBase(L"val", rtn);
+                    XmlMacroReadAttributeBase(oNode, L"val", rtn)
 
 				tgtEl = node.ReadNode(_T("p:tgtEl"));
 				
@@ -118,4 +118,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_COND_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_COND_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CondLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CondLst.h
index 4a5bc9dd0d..d58f83848e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CondLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/CondLst.h
@@ -60,7 +60,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name = XmlUtils::GetNameNoNS(node.GetName());
-				node.LoadArray(_T("p:cond"), list);
+                XmlMacroLoadArray(node, _T("p:cond"), list, Cond);
 
 				FillParentPointersForChilds();
 			}
@@ -86,4 +86,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CONDLST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_CONDLST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/GraphicEl.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/GraphicEl.h
index 121166c7f3..24717a4e0e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/GraphicEl.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/GraphicEl.h
@@ -53,14 +53,14 @@ namespace PPTX
 				
 				if (node.GetNode(_T("p:chart"), oNode))
 				{
-					oNode.ReadAttributeBase(L"bldStep", chartBuildStep);
-					oNode.ReadAttributeBase(L"seriesIdx", seriesIdx);
-					oNode.ReadAttributeBase(L"categoryIdx", categoryIdx);
+                    XmlMacroReadAttributeBase(oNode, L"bldStep", chartBuildStep);
+                    XmlMacroReadAttributeBase(oNode, L"seriesIdx", seriesIdx);
+                    XmlMacroReadAttributeBase(oNode, L"categoryIdx", categoryIdx);
 				}
 				else if (node.GetNode(_T("p:dgm"), oNode))
 				{
-					oNode.ReadAttributeBase(L"bldStep", dgmBuildStep);
-					oNode.ReadAttributeBase(L"id", dgmId);
+                    XmlMacroReadAttributeBase(oNode, L"bldStep", dgmBuildStep);
+                    XmlMacroReadAttributeBase(oNode, L"id", dgmId);
 				}
 			}
 
@@ -97,4 +97,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_GRAPHICEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_GRAPHICEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Iterate.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Iterate.h
index 41e0b492dc..f282e3d04e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Iterate.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Iterate.h
@@ -48,14 +48,14 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"type", type);
-				node.ReadAttributeBase(L"backwards", backwards);
+                XmlMacroReadAttributeBase(node, L"type", type);
+                XmlMacroReadAttributeBase(node, L"backwards", backwards);
 
 				XmlUtils::CXmlNode oNode;			
 				if (node.GetNode(_T("p:tmAbs"), oNode))
-					oNode.ReadAttributeBase(L"val", tmAbs);
+                    XmlMacroReadAttributeBase(oNode, L"val", tmAbs)
 				else if (node.GetNode(_T("p:tmPct"), oNode))
-					oNode.ReadAttributeBase(L"val", tmPct);
+                    XmlMacroReadAttributeBase(oNode, L"val", tmPct)
 
 				FillParentPointersForChilds();
 			}
@@ -94,4 +94,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ITERATE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ITERATE_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Seq.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Seq.h
index 5af7e3f2ca..f811937813 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Seq.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Seq.h
@@ -55,9 +55,9 @@ namespace PPTX
 				nextCondLst = node.ReadNode(_T("p:nextCondLst"));
 				prevCondLst = node.ReadNode(_T("p:prevCondLst"));
 
-				node.ReadAttributeBase(L"concurrent", concurrent);
-				node.ReadAttributeBase(L"nextAc", nextAc);
-				node.ReadAttributeBase(L"prevAc", prevAc);
+                XmlMacroReadAttributeBase(node, L"concurrent", concurrent);
+                XmlMacroReadAttributeBase(node, L"nextAc", nextAc);
+                XmlMacroReadAttributeBase(node, L"prevAc", prevAc);
 
 				FillParentPointersForChilds();
 			}
@@ -98,4 +98,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SEQ_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_SEQ_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/SpTgt.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/SpTgt.h
index a8098ed851..f4943fffb7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/SpTgt.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/SpTgt.h
@@ -58,12 +58,12 @@ namespace PPTX
 				XmlUtils::CXmlNode oNodeMem;
 				if (node.GetNode(_T("p:subSp"), oNodeMem))
 				{
-					oNodeMem.ReadAttributeBase(L"spid", subSpid);
+                    XmlMacroReadAttributeBase(oNodeMem, L"spid", subSpid);
 				}
 				else if (node.GetNode(_T("p:oleChartEl"), oNodeMem))
 				{
-					oNodeMem.ReadAttributeBase(L"type", type);
-					oNodeMem.ReadAttributeBase(L"lvl", lvl);
+                    XmlMacroReadAttributeBase(oNodeMem, L"type", type);
+                    XmlMacroReadAttributeBase(oNodeMem, L"lvl", lvl);
 				}
 				else
 				{
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tav.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tav.h
index 97ee7267bf..686e8384bd 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tav.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tav.h
@@ -48,8 +48,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"tm", tm);
-				node.ReadAttributeBase(L"fmla", fmla);
+                XmlMacroReadAttributeBase(node, L"tm", tm);
+                XmlMacroReadAttributeBase(node, L"fmla", fmla);
 			
 				val		= node.ReadNodeNoNS(_T("val"));
 
@@ -81,4 +81,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_Tav_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_Tav_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TavLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TavLst.h
index 2c9af65d67..6f4ce16704 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TavLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TavLst.h
@@ -57,7 +57,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.LoadArray(_T("p:tav"), list);
+                XmlMacroLoadArray(node, _T("p:tav"), list, Tav);
 				FillParentPointersForChilds();
 			}
 
@@ -81,4 +81,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TAVLST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TAVLST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TgtEl.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TgtEl.h
index f87c1d0914..aec1004341 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TgtEl.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TgtEl.h
@@ -54,9 +54,9 @@ namespace PPTX
 					inkTgt = oNode.ReadAttributeBase(L"spid");
 				else if(node.GetNode(_T("p:sndTgt"), oNode))
 				{
-					oNode.ReadAttributeBase(L"embed", embed);
-					oNode.ReadAttributeBase(L"name", name);
-					oNode.ReadAttributeBase(L"builtIn", builtIn);
+                    XmlMacroReadAttributeBase(oNode, L"embed", embed);
+                    XmlMacroReadAttributeBase(oNode, L"name", name);
+                    XmlMacroReadAttributeBase(oNode, L"builtIn", builtIn);
 				}
 				else if(node.GetNode(_T("p:spTgt"), oNode))
 					spTgt = oNode;
@@ -107,4 +107,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TGTEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TGTEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tmpl.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tmpl.h
index 0671fed69a..5a8330e302 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tmpl.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Tmpl.h
@@ -49,7 +49,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				tnLst	= node.ReadNode(_T("p:tnLst"));
-				node.ReadAttributeBase(L"lvl", lvl);
+                XmlMacroReadAttributeBase(node, L"lvl", lvl);
 				FillParentPointersForChilds();
 			}
 
@@ -77,4 +77,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TMPL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TMPL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TmplLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TmplLst.h
index b2dbc6ed4f..751fe6701c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TmplLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TmplLst.h
@@ -57,7 +57,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.LoadArray(_T("p:tmpl"), list);
+                XmlMacroLoadArray(node, _T("p:tmpl"), list, Tmpl);
 				FillParentPointersForChilds();
 			}
 
@@ -81,4 +81,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TMPLLST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TMPLLST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TnLst.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TnLst.h
index 6331f458ec..662debe1e0 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TnLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TnLst.h
@@ -59,7 +59,7 @@ namespace PPTX
 			{
 				name = XmlUtils::GetNameNoNS(node.GetName());
 				
-				node.LoadArray(_T("*"), list);
+                XmlMacroLoadArray(node, _T("*"), list, TimeNodeBase);
 				FillParentPointersForChilds();
 			}
 
@@ -83,4 +83,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TNLST_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TNLST_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TxEl.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TxEl.h
index 4e05c9ca63..d215d89a1b 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TxEl.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TxEl.h
@@ -51,14 +51,14 @@ namespace PPTX
 				if (node.GetNode(_T("p:charRg"), oNode))
 				{
 					charRg = true;
-					oNode.ReadAttributeBase(L"st", st);
-					oNode.ReadAttributeBase(L"end", end);
+                    XmlMacroReadAttributeBase(oNode, L"st", st);
+                    XmlMacroReadAttributeBase(oNode, L"end", end);
 				}
 				else if(node.GetNode(_T("p:pRg"), oNode))
 				{
 					charRg = false;
-					oNode.ReadAttributeBase(L"st", st);
-					oNode.ReadAttributeBase(L"end", end);
+                    XmlMacroReadAttributeBase(oNode, L"st", st);
+                    XmlMacroReadAttributeBase(oNode, L"end", end);
 				}
 				else
 				{
@@ -94,4 +94,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_TXEL_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_TXEL_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Video.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Video.h
index e6c3d21b2e..ee0f989f4c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Video.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Video.h
@@ -48,7 +48,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"fullScrn", fullScrn);
+                XmlMacroReadAttributeBase(node, L"fullScrn", fullScrn);
 				cMediaNode	= node.ReadNode(_T("cMediaNode"));
 
 				FillParentPointersForChilds();
@@ -74,4 +74,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_VIDEO_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_VIDEO_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h
index 19d8453681..1d2f6a7a21 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h
@@ -53,7 +53,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name	= XmlUtils::GetNameNoNS(node.GetName());
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 			}
 
 			virtual std::wstring toXML() const
@@ -73,4 +73,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CORNERDIRECTION_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_CORNERDIRECTION_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EightDirectionTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EightDirectionTransition.h
index 17e55b2b91..eeb6d0daba 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EightDirectionTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EightDirectionTransition.h
@@ -53,7 +53,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name	= XmlUtils::GetNameNoNS(node.GetName());
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 			}
 
 			virtual std::wstring toXML() const
@@ -72,4 +72,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_EIGHTDIRECTION_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_EIGHTDIRECTION_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h
index 5b13a6632a..85f8f78eb3 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h
@@ -52,7 +52,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name = XmlUtils::GetNameNoNS(node.GetName());
-				node.ReadAttributeBase(L"thruBlk", thruBlk);
+                XmlMacroReadAttributeBase(node, L"thruBlk", thruBlk);
 			}
 
 			virtual std::wstring toXML() const
@@ -72,4 +72,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_OPTIONALBLACK_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_OPTIONALBLACK_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OrientationTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OrientationTransition.h
index c3987b85cf..5452ab496c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OrientationTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OrientationTransition.h
@@ -53,7 +53,7 @@ namespace PPTX
 			void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name	= XmlUtils::GetNameNoNS(node.GetName());
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 			}
 
 			std::wstring toXML() const
@@ -72,4 +72,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ORIENTATION_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_ORIENTATION_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SideDirectionTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SideDirectionTransition.h
index 798adf3ee8..b5e9406ba6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SideDirectionTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SideDirectionTransition.h
@@ -53,7 +53,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name	= XmlUtils::GetNameNoNS(node.GetName());
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 			}
 
 			virtual std::wstring toXML() const
@@ -72,4 +72,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SIDEDIRECTION_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_SIDEDIRECTION_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h
index 16e58a3188..91bac1c8e3 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h
@@ -53,8 +53,8 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"dir", dir);
-				node.ReadAttributeBase(L"orient", orient);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"orient", orient);
 			}
 
 			virtual std::wstring toXML() const
@@ -74,4 +74,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SPLIT_TRANSITION_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LOGIC_SPLIT_TRANSITION_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/StSnd.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/StSnd.h
index 9f01e03f84..62c71a7123 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/StSnd.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/StSnd.h
@@ -49,13 +49,13 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"loop", loop);
+                XmlMacroReadAttributeBase(node, L"loop", loop);
 
 				XmlUtils::CXmlNode oNode;
 				node.GetNode(_T("p:snd"), oNode);
 
-				oNode.ReadAttributeBase(L"r:embed", embed);
-				oNode.ReadAttributeBase(L"name", name);
+                XmlMacroReadAttributeBase(oNode, L"r:embed", embed);
+                XmlMacroReadAttributeBase(oNode, L"name", name);
 
 				FillParentPointersForChilds();
 			}
@@ -82,4 +82,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_SLIDES_STSND_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_SLIDES_STSND_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h
index 40f437e53b..0da6da477d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h
@@ -50,10 +50,10 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"advClick", advClick);
-				node.ReadAttributeBase(L"advTm",	advTm);
-				node.ReadAttributeBase(L"p14:dur",	dur);	
-				node.ReadAttributeBase(L"spd",		spd);
+                XmlMacroReadAttributeBase(node, L"advClick", advClick);
+                XmlMacroReadAttributeBase(node, L"advTm",	advTm);
+                XmlMacroReadAttributeBase(node, L"p14:dur",	dur);
+                XmlMacroReadAttributeBase(node, L"spd",		spd);
 
 				XmlUtils::CXmlNodes oNodes;
 				
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.cpp
index 1300aeb652..d99e9b6e6a 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.cpp
@@ -136,7 +136,7 @@ namespace PPTX
 		void TransitionSerialize::fromXML(XmlUtils::CXmlNode& node)
 		{
 			m_strNodeName = node.GetName();
-			node.ReadAllAttributes(m_strAttributesNames, m_strAttributesValues);
+            node.GetAllAttributes(m_strAttributesNames, m_strAttributesValues);
 		}
 
 		std::wstring TransitionSerialize::toXML() const
@@ -144,4 +144,4 @@ namespace PPTX
 			return _T("");
 		}
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/WheelTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/WheelTransition.h
index bc9e5e3c8f..23ec34bb02 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/WheelTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/WheelTransition.h
@@ -51,7 +51,7 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"spokes", spokes);
+                XmlMacroReadAttributeBase(node, L"spokes", spokes);
 			}
 
 			virtual std::wstring toXML() const
@@ -74,4 +74,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_WHEEL_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_WHEEL_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h
index 05123464d0..773e4e5d1f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h
@@ -52,7 +52,7 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"dir", dir);
+                XmlMacroReadAttributeBase(node, L"dir", dir);
 			}
 
 			virtual std::wstring toXML() const
@@ -70,4 +70,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_Zoom_TRANSITION_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_Zoom_TRANSITION_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h
index 1a6beb341e..9dd257f27c 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.h
@@ -123,7 +123,7 @@ namespace PPTX
 				bodyPr		= node.ReadNode(_T("a:bodyPr"));
 				lstStyle	= node.ReadNode(_T("a:lstStyle"));
 
-				node.LoadArray(_T("a:p"), Paragrs);
+				XmlMacroLoadArray(node, _T("a:p"), Paragrs, Paragraph);
 
 				FillParentPointersForChilds();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Xfrm.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Xfrm.h
index 91b85cbf0b..0c4cdb6049 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/Xfrm.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Xfrm.h
@@ -112,33 +112,33 @@ namespace PPTX
 			{
 				m_ns = XmlUtils::GetNamespace(node.GetName());
 
-				node.ReadAttributeBase(L"flipH", flipH);
-				node.ReadAttributeBase(L"flipV", flipV);
-				node.ReadAttributeBase(L"rot", rot);
+				XmlMacroReadAttributeBase(node, L"flipH", flipH);
+				XmlMacroReadAttributeBase(node, L"flipV", flipV);
+				XmlMacroReadAttributeBase(node, L"rot", rot);
 
 				XmlUtils::CXmlNode oNodeOff;
 				if(node.GetNode(_T("a:off"), oNodeOff))
 				{
-					oNodeOff.ReadAttributeBase(L"x", offX);
-					oNodeOff.ReadAttributeBase(L"y", offY);
+					XmlMacroReadAttributeBase(oNodeOff, L"x", offX);
+					XmlMacroReadAttributeBase(oNodeOff, L"y", offY);
 				}
 				XmlUtils::CXmlNode oNodeExt;
 				if(node.GetNode(_T("a:ext"), oNodeExt))
 				{
-					oNodeExt.ReadAttributeBase(L"cx", extX);
-					oNodeExt.ReadAttributeBase(L"cy", extY);
+					XmlMacroReadAttributeBase(oNodeExt, L"cx", extX);
+					XmlMacroReadAttributeBase(oNodeExt, L"cy", extY);
 				}
 				XmlUtils::CXmlNode oNodeChOff;
 				if(node.GetNode(_T("a:chOff"), oNodeChOff))
 				{
-					oNodeChOff.ReadAttributeBase(L"x", chOffX);
-					oNodeChOff.ReadAttributeBase(L"y", chOffY);
+					XmlMacroReadAttributeBase(oNodeChOff, L"x", chOffX);
+					XmlMacroReadAttributeBase(oNodeChOff, L"y", chOffY);
 				}
 				XmlUtils::CXmlNode oNodeChExt;
 				if(node.GetNode(_T("a:chExt"), oNodeChExt))
 				{
-					oNodeChExt.ReadAttributeBase(L"cx", chExtX);
-					oNodeChExt.ReadAttributeBase(L"cy", chExtY);
+					XmlMacroReadAttributeBase(oNodeChExt, L"cx", chExtX);
+					XmlMacroReadAttributeBase(oNodeChExt, L"cy", chExtY);
 				}
 				Normalize();
 			}
@@ -439,4 +439,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_XFRM_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_XFRM_INCLUDE_H
diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/XmlId.h b/ASCOfficePPTXFile/PPTXFormat/Logic/XmlId.h
index 26775fab1c..88f251de0d 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/XmlId.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/XmlId.h
@@ -53,8 +53,8 @@ namespace PPTX
 			{
 				m_name = node.GetName();
 
-				node.ReadAttributeBase(L"r:id", rid);
-				node.ReadAttributeBase(L"id", id);
+				XmlMacroReadAttributeBase(node, L"r:id", rid);
+				XmlMacroReadAttributeBase(node, L"id", id);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -127,4 +127,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_PPTSLIDES_XMLID_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_PPTSLIDES_XMLID_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/NotesSlide.h b/ASCOfficePPTXFile/PPTXFormat/NotesSlide.h
index f762b4502e..e4513daf35 100644
--- a/ASCOfficePPTXFile/PPTXFormat/NotesSlide.h
+++ b/ASCOfficePPTXFile/PPTXFormat/NotesSlide.h
@@ -61,8 +61,8 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"showMasterPhAnim", showMasterPhAnim);
-			oNode.ReadAttributeBase(L"showMasterSp", showMasterSp);
+            XmlMacroReadAttributeBase(oNode, L"showMasterPhAnim", showMasterPhAnim);
+            XmlMacroReadAttributeBase(oNode, L"showMasterSp", showMasterSp);
 
 			cSld = oNode.ReadNode(_T("p:cSld"));
 			cSld.SetParentFilePointer(this);
diff --git a/ASCOfficePPTXFile/PPTXFormat/PresProps.h b/ASCOfficePPTXFile/PPTXFormat/PresProps.h
index b52b6cc8f1..dc3bc51f37 100644
--- a/ASCOfficePPTXFile/PPTXFormat/PresProps.h
+++ b/ASCOfficePPTXFile/PPTXFormat/PresProps.h
@@ -65,7 +65,7 @@ namespace PPTX
 			ClrMru.clear();
 			XmlUtils::CXmlNode oNodeClr;
 			if (oNode.GetNode(_T("p:clrMru"), oNodeClr))
-				oNodeClr.LoadArray(_T("*"), ClrMru);
+                XmlMacroLoadArray(oNodeClr, _T("*"), ClrMru, Logic::UniColor);
 
 			showPr = oNode.ReadNode(_T("p:showPr"));
 			if(showPr.is_init())
@@ -175,4 +175,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_PRESPROPS_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_PRESPROPS_FILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Presentation.h b/ASCOfficePPTXFile/PPTXFormat/Presentation.h
index c715916f19..83d583c1d5 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Presentation.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Presentation.h
@@ -76,18 +76,18 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"autoCompressPictures", attrAutoCompressPictures);
-			oNode.ReadAttributeBase(L"bookmarkIdSeed", attrBookmarkIdSeed);
-			oNode.ReadAttributeBase(L"compatMode", attrCompatMode);
-			oNode.ReadAttributeBase(L"conformance", attrConformance);
-			oNode.ReadAttributeBase(L"embedTrueTypeFonts", attrEmbedTrueTypeFonts);
-			oNode.ReadAttributeBase(L"firstSlideNum", attrFirstSlideNum);
-			oNode.ReadAttributeBase(L"removePersonalInfoOnSave", attrRemovePersonalInfoOnSave);
-			oNode.ReadAttributeBase(L"rtl", attrRtl);
-			oNode.ReadAttributeBase(L"saveSubsetFonts", attrSaveSubsetFonts);
-			oNode.ReadAttributeBase(L"serverZoom", attrServerZoom);
-			oNode.ReadAttributeBase(L"showSpecialPlsOnTitleSld", attrShowSpecialPlsOnTitleSld);
-			oNode.ReadAttributeBase(L"strictFirstAndLastChars", attrStrictFirstAndLastChars);
+			XmlMacroReadAttributeBase(oNode, L"autoCompressPictures", attrAutoCompressPictures);
+			XmlMacroReadAttributeBase(oNode, L"bookmarkIdSeed", attrBookmarkIdSeed);
+			XmlMacroReadAttributeBase(oNode, L"compatMode", attrCompatMode);
+			XmlMacroReadAttributeBase(oNode, L"conformance", attrConformance);
+			XmlMacroReadAttributeBase(oNode, L"embedTrueTypeFonts", attrEmbedTrueTypeFonts);
+			XmlMacroReadAttributeBase(oNode, L"firstSlideNum", attrFirstSlideNum);
+			XmlMacroReadAttributeBase(oNode, L"removePersonalInfoOnSave", attrRemovePersonalInfoOnSave);
+			XmlMacroReadAttributeBase(oNode, L"rtl", attrRtl);
+			XmlMacroReadAttributeBase(oNode, L"saveSubsetFonts", attrSaveSubsetFonts);
+			XmlMacroReadAttributeBase(oNode, L"serverZoom", attrServerZoom);
+			XmlMacroReadAttributeBase(oNode, L"showSpecialPlsOnTitleSld", attrShowSpecialPlsOnTitleSld);
+			XmlMacroReadAttributeBase(oNode, L"strictFirstAndLastChars", attrStrictFirstAndLastChars);
 
 			//custDataLst (Customer Data List)
 			//custShowLst (List of Custom Shows)
@@ -99,7 +99,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNodeEmbeddedFonts;
 			if (oNode.GetNode(_T("p:embeddedFontLst"), oNodeEmbeddedFonts))
 			{
-				oNodeEmbeddedFonts.LoadArray(_T("p:embeddedFont"), embeddedFontLst);
+				XmlMacroLoadArray(oNodeEmbeddedFonts, _T("p:embeddedFont"), embeddedFontLst, nsPresentation::EmbeddedFont);
 
 				for (size_t i = 0; i < embeddedFontLst.size(); ++i)
 					embeddedFontLst[i].SetParentFilePointer(this);
@@ -109,7 +109,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNodeHMList;
 			if (oNode.GetNode(_T("p:handoutMasterIdLst"), oNodeHMList))
 			{
-				oNodeHMList.LoadArray(_T("p:handoutMasterId"), handoutMasterIdLst);
+				XmlMacroLoadArray(oNodeHMList, _T("p:handoutMasterId"), handoutMasterIdLst, Logic::XmlId);
 
 				for (size_t i = 0; i < handoutMasterIdLst.size(); ++i)
 					handoutMasterIdLst[i].SetParentFilePointer(this);
@@ -125,7 +125,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNodeMIDList;
 			if (oNode.GetNode(_T("p:notesMasterIdLst"), oNodeMIDList))
 			{
-				oNodeMIDList.LoadArray(_T("p:notesMasterId"), notesMasterIdLst);
+				XmlMacroLoadArray(oNodeMIDList, _T("p:notesMasterId"), notesMasterIdLst, Logic::XmlId);
 
 				for (size_t i = 0; i < notesMasterIdLst.size(); ++i)
 					notesMasterIdLst[i].SetParentFilePointer(this);
@@ -143,7 +143,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode_sldId;
 			if (oNode.GetNode(_T("p:sldIdLst"), oNode_sldId))
 			{
-				oNode_sldId.LoadArray(_T("p:sldId"), sldIdLst);
+				XmlMacroLoadArray(oNode_sldId, _T("p:sldId"), sldIdLst, Logic::XmlId);
 
 				for (size_t i = 0; i < sldIdLst.size(); ++i)
 					sldIdLst[i].SetParentFilePointer(this);
@@ -153,7 +153,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode_sldM_Id;
 			if (oNode.GetNode(_T("p:sldMasterIdLst"), oNode_sldM_Id))
 			{
-				oNode_sldM_Id.LoadArray(_T("p:sldMasterId"), sldMasterIdLst);
+				XmlMacroLoadArray(oNode_sldM_Id, _T("p:sldMasterId"), sldMasterIdLst, Logic::XmlId);
 
 				for (size_t i = 0; i < sldMasterIdLst.size(); ++i)
 					sldMasterIdLst[i].SetParentFilePointer(this);
diff --git a/ASCOfficePPTXFile/PPTXFormat/Presentation/Kinsoku.h b/ASCOfficePPTXFile/PPTXFormat/Presentation/Kinsoku.h
index 9899df0888..b356d32400 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Presentation/Kinsoku.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Presentation/Kinsoku.h
@@ -50,7 +50,7 @@ namespace PPTX
 				invalEndChars	= node.GetAttribute(_T("invalEndChars"));
 				invalStChars	= node.GetAttribute(_T("invalStChars"));
 
-				node.ReadAttributeBase(L"lang", lang);
+				XmlMacroReadAttributeBase(node, L"lang", lang);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -77,4 +77,4 @@ namespace PPTX
 	} // namespace nsPresentation
 } // namespace PPTX
 
-#endif // PPTX_PRESENTATION_KINSOKU_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_PRESENTATION_KINSOKU_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Presentation/PhotoAlbum.h b/ASCOfficePPTXFile/PPTXFormat/Presentation/PhotoAlbum.h
index 5507713f2c..4192b20c2f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Presentation/PhotoAlbum.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Presentation/PhotoAlbum.h
@@ -49,10 +49,10 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"bw", bw);
-				node.ReadAttributeBase(L"frame", frame);
-				node.ReadAttributeBase(L"layout", layout);
-				node.ReadAttributeBase(L"showCaptions", showCaptions);
+				XmlMacroReadAttributeBase(node, L"bw", bw);
+				XmlMacroReadAttributeBase(node, L"frame", frame);
+				XmlMacroReadAttributeBase(node, L"layout", layout);
+				XmlMacroReadAttributeBase(node, L"showCaptions", showCaptions);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -81,4 +81,4 @@ namespace PPTX
 	} // namespace nsPresentation
 } // namespace PPTX
 
-#endif // PPTX_PRESENTATION_PHOTOALBUM_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_PRESENTATION_PHOTOALBUM_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Presentation/SectionLst.h b/ASCOfficePPTXFile/PPTXFormat/Presentation/SectionLst.h
index 35607ee8f6..8f55f1c0ff 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Presentation/SectionLst.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Presentation/SectionLst.h
@@ -48,13 +48,13 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"id", id);
-				node.ReadAttributeBase(L"name", name);
+				XmlMacroReadAttributeBase(node, L"id", id);
+				XmlMacroReadAttributeBase(node, L"name", name);
 
 				XmlUtils::CXmlNode oNodeSldIdLst;
 				if (node.GetNode(L"p14:sldIdLst", oNodeSldIdLst))
 				{
-					oNodeSldIdLst.LoadArray(L"p14:sldId", arSldIdLst);
+					XmlMacroLoadArray(oNodeSldIdLst, L"p14:sldId", arSldIdLst, Logic::XmlId);
 				}
 			}
 
diff --git a/ASCOfficePPTXFile/PPTXFormat/Presentation/SldSz.h b/ASCOfficePPTXFile/PPTXFormat/Presentation/SldSz.h
index 14596f1c6c..df776db0d3 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Presentation/SldSz.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Presentation/SldSz.h
@@ -51,7 +51,7 @@ namespace PPTX
 				cx = node.ReadAttributeInt(L"cx");
 				cy = node.ReadAttributeInt(L"cy");
 
-				node.ReadAttributeBase(L"type", type);
+				XmlMacroReadAttributeBase(node, L"type", type);
 
 				Normalize();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/ShowPr/Browse.h b/ASCOfficePPTXFile/PPTXFormat/ShowPr/Browse.h
index 58bcf49f1a..e9b0c978ad 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ShowPr/Browse.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ShowPr/Browse.h
@@ -47,7 +47,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(_T("showScrollbar"), showScrollbar);
+                XmlMacroReadAttributeBase(node, _T("showScrollbar"), showScrollbar);
 			}
 			virtual std::wstring toXML() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/ShowPr/CustShow.h b/ASCOfficePPTXFile/PPTXFormat/ShowPr/CustShow.h
index 546225233a..703bb2f795 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ShowPr/CustShow.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ShowPr/CustShow.h
@@ -47,7 +47,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(_T("id"), id);
+                XmlMacroReadAttributeBase(node, _T("id"), id);
 			}
 			virtual std::wstring toXML() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/ShowPr/Kiosk.h b/ASCOfficePPTXFile/PPTXFormat/ShowPr/Kiosk.h
index d51967da58..1e6bad3862 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ShowPr/Kiosk.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ShowPr/Kiosk.h
@@ -47,7 +47,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(_T("restart"), restart);
+                XmlMacroReadAttributeBase(node, _T("restart"), restart);
 			}
 			virtual std::wstring toXML() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/ShowPr/ShowPr.h b/ASCOfficePPTXFile/PPTXFormat/ShowPr/ShowPr.h
index 18358c8ccb..4f3bf92aa7 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ShowPr/ShowPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ShowPr/ShowPr.h
@@ -54,10 +54,10 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(_T("loop"), loop);
-				node.ReadAttributeBase(_T("showAnimation"), showAnimation);
-				node.ReadAttributeBase(_T("showNarration"), showNarration);
-				node.ReadAttributeBase(_T("useTimings"), useTimings);
+                XmlMacroReadAttributeBase(node, _T("loop"), loop);
+                XmlMacroReadAttributeBase(node, _T("showAnimation"), showAnimation);
+                XmlMacroReadAttributeBase(node, _T("showNarration"), showNarration);
+                XmlMacroReadAttributeBase(node, _T("useTimings"), useTimings);
 
 				Browse = node.ReadNodeNoNS(_T("browse"));
 				CustShow = node.ReadNodeNoNS(_T("custShow"));
diff --git a/ASCOfficePPTXFile/PPTXFormat/ShowPr/SldRg.h b/ASCOfficePPTXFile/PPTXFormat/ShowPr/SldRg.h
index 2eda9f73b1..be29e81ef6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ShowPr/SldRg.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ShowPr/SldRg.h
@@ -47,8 +47,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(_T("st"), st);
-				node.ReadAttributeBase(_T("end"), end);
+                XmlMacroReadAttributeBase(node, _T("st"), st);
+                XmlMacroReadAttributeBase(node, _T("end"), end);
 			}
             virtual std::wstring toXML() const
 			{
diff --git a/ASCOfficePPTXFile/PPTXFormat/Slide.h b/ASCOfficePPTXFile/PPTXFormat/Slide.h
index 2d8197bc4c..c0870266df 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Slide.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Slide.h
@@ -76,9 +76,9 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"show", show);
-			oNode.ReadAttributeBase(L"showMasterPhAnim", showMasterPhAnim);
-			oNode.ReadAttributeBase(L"showMasterSp", showMasterSp);
+            XmlMacroReadAttributeBase(oNode, L"show", show);
+            XmlMacroReadAttributeBase(oNode, L"showMasterPhAnim", showMasterPhAnim);
+            XmlMacroReadAttributeBase(oNode, L"showMasterSp", showMasterSp);
 
 			cSld		= oNode.ReadNode(_T("p:cSld"));
 			if (cSld.IsInit())
diff --git a/ASCOfficePPTXFile/PPTXFormat/SlideLayout.h b/ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
index 123e5985b6..144008a757 100644
--- a/ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
+++ b/ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
@@ -98,12 +98,12 @@ namespace PPTX
 			if(hf.is_init())
 				hf->SetParentFilePointer(this);
 
-			oNode.ReadAttributeBase(L"matchingName", matchingName);
-			oNode.ReadAttributeBase(L"preserve", preserve);
-			oNode.ReadAttributeBase(L"showMasterPhAnim", showMasterPhAnim);
-			oNode.ReadAttributeBase(L"showMasterSp", showMasterSp);
-			oNode.ReadAttributeBase(L"type", attrType);
-			oNode.ReadAttributeBase(L"userDrawn", userDrawn);
+            XmlMacroReadAttributeBase(oNode, L"matchingName", matchingName);
+            XmlMacroReadAttributeBase(oNode, L"preserve", preserve);
+            XmlMacroReadAttributeBase(oNode, L"showMasterPhAnim", showMasterPhAnim);
+            XmlMacroReadAttributeBase(oNode, L"showMasterSp", showMasterSp);
+            XmlMacroReadAttributeBase(oNode, L"type", attrType);
+            XmlMacroReadAttributeBase(oNode, L"userDrawn", userDrawn);
 		}
 		virtual void write(const OOX::CPath& filename, const OOX::CPath& directory, OOX::CContentTypes& content)const
 		{
diff --git a/ASCOfficePPTXFile/PPTXFormat/SlideMaster.h b/ASCOfficePPTXFile/PPTXFormat/SlideMaster.h
index e6cfcf8c06..062974840f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/SlideMaster.h
+++ b/ASCOfficePPTXFile/PPTXFormat/SlideMaster.h
@@ -76,7 +76,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"preserve", preserve);
+            XmlMacroReadAttributeBase(oNode, L"preserve", preserve);
 			
 			cSld = oNode.ReadNode(_T("p:cSld"));
 			cSld.SetParentFilePointer(this);
@@ -88,7 +88,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNodeList;
 			if (oNode.GetNode(_T("p:sldLayoutIdLst"), oNodeList))
 			{
-				oNodeList.LoadArray(_T("p:sldLayoutId"), sldLayoutIdLst);
+                XmlMacroLoadArray(oNodeList, _T("p:sldLayoutId"), sldLayoutIdLst, Logic::XmlId);
 
 				size_t count = sldLayoutIdLst.size();
 				for (size_t i = 0; i < count; ++i)
diff --git a/ASCOfficePPTXFile/PPTXFormat/TableStyles.h b/ASCOfficePPTXFile/PPTXFormat/TableStyles.h
index 7921b53971..da423a7551 100644
--- a/ASCOfficePPTXFile/PPTXFormat/TableStyles.h
+++ b/ASCOfficePPTXFile/PPTXFormat/TableStyles.h
@@ -58,7 +58,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"def", def);
+            XmlMacroReadAttributeBase(oNode, L"def", def);
 
 			Styles.clear();
 			Logic::TableStyle Style;
@@ -274,4 +274,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_TABLESTYLES_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_TABLESTYLES_FILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/Theme.h b/ASCOfficePPTXFile/PPTXFormat/Theme.h
index 2a35feff71..53e09214d4 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Theme.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Theme.h
@@ -110,7 +110,7 @@ namespace PPTX
 				return;
 			}
 
-			oNode.ReadAttributeBase(_T("name"), name);
+			XmlMacroReadAttributeBase(oNode, _T("name"), name);
 
 			themeElements = oNode.ReadNode(_T("a:themeElements"));
 			themeElements.SetParentFilePointer(this);
@@ -135,7 +135,7 @@ namespace PPTX
 			XmlUtils::CXmlNode oNodeList;
 			if (oNode.GetNode(_T("a:extraClrSchemeLst"), oNodeList))
 			{
-				oNodeList.LoadArray(_T("a:extraClrScheme"), extraClrSchemeLst);
+				XmlMacroLoadArray(oNodeList, _T("a:extraClrScheme"), extraClrSchemeLst, nsTheme::ExtraClrScheme);
 			}
 
 			size_t count = extraClrSchemeLst.size();
diff --git a/ASCOfficePPTXFile/PPTXFormat/Theme/FmtScheme.h b/ASCOfficePPTXFile/PPTXFormat/Theme/FmtScheme.h
index 7ed9b61523..6d1d46012f 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Theme/FmtScheme.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Theme/FmtScheme.h
@@ -73,16 +73,16 @@ namespace PPTX
                 name = node.GetAttribute(_T("name"));
 
 				XmlUtils::CXmlNode oNode1 = node.ReadNode(_T("a:fillStyleLst"));
-				oNode1.LoadArray(_T("*"), fillStyleLst);
+				XmlMacroLoadArray(oNode1, _T("*"), fillStyleLst, Logic::UniFill);
 
 				XmlUtils::CXmlNode oNode2 = node.ReadNode(_T("a:lnStyleLst"));
-				oNode2.LoadArray(_T("a:ln"), lnStyleLst);
+				XmlMacroLoadArray(oNode2, _T("a:ln"), lnStyleLst, Logic::Ln);
 
 				XmlUtils::CXmlNode oNode3 = node.ReadNode(_T("a:effectStyleLst"));
-				oNode3.LoadArray(_T("a:effectStyle"), effectStyleLst);
+				XmlMacroLoadArray(oNode3, _T("a:effectStyle"), effectStyleLst, Logic::EffectStyle);
 
 				XmlUtils::CXmlNode oNode4 = node.ReadNode(_T("a:bgFillStyleLst"));
-				oNode4.LoadArray(_T("*"), bgFillStyleLst);
+				XmlMacroLoadArray(oNode4, _T("*"), bgFillStyleLst, Logic::UniFill);
 
 				FillParentPointersForChilds();
 			}
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps.h
index 377feadfc1..938c58d159 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps.h
@@ -70,8 +70,8 @@ namespace PPTX
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
-			oNode.ReadAttributeBase(L"lastView", attrLastView);
-			oNode.ReadAttributeBase(L"showComments", attrShowComments);
+            XmlMacroReadAttributeBase(oNode, L"lastView", attrLastView);
+            XmlMacroReadAttributeBase(oNode, L"showComments", attrShowComments);
 
 			
 			GridSpacing = oNode.ReadNode(_T("p:gridSpacing"));
@@ -182,4 +182,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_FILE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/CSldViewPr.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/CSldViewPr.h
index a89fdc9e62..f4e3ad8618 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/CSldViewPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/CSldViewPr.h
@@ -68,11 +68,12 @@ namespace PPTX
 
 				CViewPr = node.ReadNode(_T("p:cViewPr"));
 
-				node.ReadNode(_T("p:guideLst")).LoadArray(_T("p:guide"), GuideLst);
+                XmlUtils::CXmlNode oNodeLst = node.ReadNode(_T("p:guideLst"));
+                XmlMacroLoadArray(oNodeLst, _T("p:guide"), GuideLst, Guide);
 
-				node.ReadAttributeBase(L"showGuides", attrShowGuides);
-				node.ReadAttributeBase(L"snapToGrid", attrSnapToGrid);
-				node.ReadAttributeBase(L"snapToObjects", attrSnapToObjects);
+                XmlMacroReadAttributeBase(node, L"showGuides", attrShowGuides);
+                XmlMacroReadAttributeBase(node, L"snapToGrid", attrSnapToGrid);
+                XmlMacroReadAttributeBase(node, L"snapToObjects", attrSnapToObjects);
 
 				FillParentPointersForChilds();
 			}
@@ -147,4 +148,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_COMMON_SLIDE_VIEW_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_COMMON_SLIDE_VIEW_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/CViewPr.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/CViewPr.h
index 64d799644e..8621691b48 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/CViewPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/CViewPr.h
@@ -49,7 +49,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"varScale", attrVarScale);
+                XmlMacroReadAttributeBase(node, L"varScale", attrVarScale);
 
 				Scale	= node.ReadNode(_T("p:scale"));
 				Origin	= node.ReadNode(_T("p:origin"));
@@ -105,4 +105,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_COMMON_VIEW_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_COMMON_VIEW_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Guide.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Guide.h
index a242ba5147..2c80270da6 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Guide.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Guide.h
@@ -48,8 +48,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"orient", orient);
-				node.ReadAttributeBase(L"pos", pos);
+                XmlMacroReadAttributeBase(node, L"orient", orient);
+                XmlMacroReadAttributeBase(node, L"pos", pos);
 				
 				Normalize();
 			}
@@ -98,4 +98,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_GUIDE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_GUIDE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/NormalViewPr.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/NormalViewPr.h
index fc695cd803..852365d747 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/NormalViewPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/NormalViewPr.h
@@ -49,12 +49,12 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"horzBarState", attrHorzBarState);
-				node.ReadAttributeBase(L"vertBarState", attrVertBarState);
+                XmlMacroReadAttributeBase(node, L"horzBarState", attrHorzBarState);
+                XmlMacroReadAttributeBase(node, L"vertBarState", attrVertBarState);
 
-				node.ReadAttributeBase(L"preferSingleView", attrPreferSingleView);
-				node.ReadAttributeBase(L"showOutlineIcons", attrShowOutlineIcons);
-				node.ReadAttributeBase(L"snapVertSplitter", attrSnapVertSplitter);
+                XmlMacroReadAttributeBase(node, L"preferSingleView", attrPreferSingleView);
+                XmlMacroReadAttributeBase(node, L"showOutlineIcons", attrShowOutlineIcons);
+                XmlMacroReadAttributeBase(node, L"snapVertSplitter", attrSnapVertSplitter);
 
 				restoredLeft	= node.ReadNodeNoNS(_T("restoredLeft"));
 				restoredTop		= node.ReadNodeNoNS(_T("restoredTop"));
@@ -141,4 +141,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_NORMAL_VIEW_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_NORMAL_VIEW_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/OutlineViewPr.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/OutlineViewPr.h
index 6e80e06129..ba68f753ef 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/OutlineViewPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/OutlineViewPr.h
@@ -63,7 +63,8 @@ namespace PPTX
 				CViewPr = node.ReadNode(_T("p:cViewPr"));
 				SldLst.clear();
 
-				node.ReadNode(_T("p:sldLst")).LoadArray(_T("p:sld"), SldLst);
+                XmlUtils::CXmlNode nodeLst = node.ReadNode(_T("p:sldLst"));
+                XmlMacroLoadArray(node, _T("p:sld"), SldLst, nsViewProps::Sld);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -117,4 +118,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_OUTLINE_VIEW_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_OUTLINE_VIEW_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Restored.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Restored.h
index 9f4273d9c6..59e88dbf00 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Restored.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Restored.h
@@ -49,7 +49,7 @@ namespace PPTX
 				name = XmlUtils::GetNameNoNS(node.GetName());
 
 				sz = node.ReadAttributeInt(L"sz");
-				node.ReadAttributeBase(L"autoAdjust", autoAdjust);
+                XmlMacroReadAttributeBase(node, L"autoAdjust", autoAdjust);
 				
 				Normalize();
 			}
@@ -86,4 +86,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_RESTORED_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_RESTORED_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Sld.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Sld.h
index 3b362a8cfe..479a09132e 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/Sld.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/Sld.h
@@ -48,8 +48,8 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"id", id);
-				node.ReadAttributeBase(L"collapse", collapse);
+                XmlMacroReadAttributeBase(node, L"id", id);
+                XmlMacroReadAttributeBase(node, L"collapse", collapse);
 			}
 			virtual std::wstring toXML() const
 			{
@@ -91,4 +91,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_SLD_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_SLD_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXFormat/ViewProps/SorterViewPr.h b/ASCOfficePPTXFile/PPTXFormat/ViewProps/SorterViewPr.h
index 45d0d3b340..274aa225ad 100644
--- a/ASCOfficePPTXFile/PPTXFormat/ViewProps/SorterViewPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/ViewProps/SorterViewPr.h
@@ -48,7 +48,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase(L"showFormatting", attrShowFormatting);
+                XmlMacroReadAttributeBase(node, L"showFormatting", attrShowFormatting);
 				CViewPr = node.ReadNode(_T("p:cViewPr"));
 
 				FillParentPointersForChilds();
@@ -97,4 +97,4 @@ namespace PPTX
 	} // namespace nsViewProps
 } // namespace PPTX
 
-#endif // PPTX_VIEWPROPS_SORTER_VIEW_PROPERTIES_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_VIEWPROPS_SORTER_VIEW_PROPERTIES_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
index a961c9d0a1..9cf1fd5623 100644
--- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
+++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
@@ -42,8 +42,6 @@ INCLUDEPATH += \
     ../../../../Common/ASCDocxFormat/Source/XML \
     ../../../../Common/ASCDocxFormat/Source
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
-
 core_release {
 SOURCES += \
     pptxformatlib_logic.cpp
diff --git a/Common/DocxFormat/Source/Common/ComplexTypes.h b/Common/DocxFormat/Source/Common/ComplexTypes.h
index f0aae72ccf..80fb4105b3 100644
--- a/Common/DocxFormat/Source/Common/ComplexTypes.h
+++ b/Common/DocxFormat/Source/Common/ComplexTypes.h
@@ -113,15 +113,15 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:color"),      m_oColor );
-				oNode.ReadAttributeBase( _T("w:frame"),      m_oFrame );
-				oNode.ReadAttributeBase( _T("w:shadow"),     m_oShadow );
-				oNode.ReadAttributeBase( _T("w:space"),      m_oSpace );
-				oNode.ReadAttributeBase( _T("w:sz"),         m_oSz );
-				oNode.ReadAttributeBase( _T("w:themeColor"), m_oThemeColor );
-				oNode.ReadAttributeBase( _T("w:themeShade"), m_oThemeShade );
-				oNode.ReadAttributeBase( _T("w:themeTint"),  m_oThemeTint );
-				oNode.ReadAttributeBase( _T("w:val"),        m_oVal );
+				XmlMacroReadAttributeBase(oNode,  _T("w:color"),      m_oColor );
+				XmlMacroReadAttributeBase(oNode,  _T("w:frame"),      m_oFrame );
+				XmlMacroReadAttributeBase(oNode,  _T("w:shadow"),     m_oShadow );
+				XmlMacroReadAttributeBase(oNode,  _T("w:space"),      m_oSpace );
+				XmlMacroReadAttributeBase(oNode,  _T("w:sz"),         m_oSz );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeColor"), m_oThemeColor );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeShade"), m_oThemeShade );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeTint"),  m_oThemeTint );
+				XmlMacroReadAttributeBase(oNode,  _T("w:val"),        m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -247,9 +247,9 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:bidi"),     m_oBidi );
-				oNode.ReadAttributeBase( _T("w:eastAsia"), m_oEastAsia );
-				oNode.ReadAttributeBase( _T("w:val"),      m_oVal );
+				XmlMacroReadAttributeBase(oNode,  _T("w:bidi"),     m_oBidi );
+				XmlMacroReadAttributeBase(oNode,  _T("w:eastAsia"), m_oEastAsia );
+				XmlMacroReadAttributeBase(oNode,  _T("w:val"),      m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -320,7 +320,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -373,15 +373,15 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:color"),          m_oColor );
-				oNode.ReadAttributeBase( _T("w:fill"),           m_oFill );
-				oNode.ReadAttributeBase( _T("w:themeColor"),     m_oThemeColor );
-				oNode.ReadAttributeBase( _T("w:themeFill"),      m_oThemeFill );
-				oNode.ReadAttributeBase( _T("w:themeFillShade"), m_oThemeFillShade );
-				oNode.ReadAttributeBase( _T("w:themeFillTint"),  m_oThemeFillTint );
-				oNode.ReadAttributeBase( _T("w:themeShade"),     m_oThemeShade );
-				oNode.ReadAttributeBase( _T("w:themeTint"),      m_oThemeTint );
-				oNode.ReadAttributeBase( _T("w:val"),            m_oVal );
+				XmlMacroReadAttributeBase(oNode,  _T("w:color"),          m_oColor );
+				XmlMacroReadAttributeBase(oNode,  _T("w:fill"),           m_oFill );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeColor"),     m_oThemeColor );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeFill"),      m_oThemeFill );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeFillShade"), m_oThemeFillShade );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeFillTint"),  m_oThemeFillTint );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeShade"),     m_oThemeShade );
+				XmlMacroReadAttributeBase(oNode,  _T("w:themeTint"),      m_oThemeTint );
+				XmlMacroReadAttributeBase(oNode,  _T("w:val"),            m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -509,8 +509,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:type"), m_oType );
-				oNode.ReadAttributeBase( _T("w:w"),    m_oW );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("w:w"),    m_oW );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -574,7 +574,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -626,7 +626,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -677,7 +677,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_sVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_sVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -738,7 +738,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -791,7 +791,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -843,10 +843,10 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:themeColor"), m_oThemeColor );
-				oNode.ReadAttributeBase( _T("w:themeShade"), m_oThemeShade );
-				oNode.ReadAttributeBase( _T("w:themeTint"),  m_oThemeTint );
-				oNode.ReadAttributeBase( _T("w:val"),        m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeColor"), m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeShade"), m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeTint"),  m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),        m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -927,7 +927,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -979,8 +979,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:format"), m_sFormat );
-				oNode.ReadAttributeBase( _T("w:val"),    m_oVal );
+				XmlMacroReadAttributeBase(oNode, _T("w:format"), m_sFormat );
+				XmlMacroReadAttributeBase(oNode, _T("w:val"),    m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1043,7 +1043,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase(oNode,  _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1097,7 +1097,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode,  _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1149,7 +1149,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1201,7 +1201,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("r:id"), m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("r:id"), m_oId );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1254,7 +1254,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1308,7 +1308,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1362,19 +1362,19 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:evenHBand"),           m_oEvenHBand );
-				oNode.ReadAttributeBase( _T("w:evenVBand"),           m_oEvenVBand );
-				oNode.ReadAttributeBase( _T("w:firstColumn"),         m_oFirstColumn );
-				oNode.ReadAttributeBase( _T("w:firstRow"),            m_oFirstRow );
-				oNode.ReadAttributeBase( _T("w:firstRowFirstColumn"), m_oFirstRowFirstColumn );
-				oNode.ReadAttributeBase( _T("w:firstRowLastColumn"),  m_oFirstRowLastColumn );
-				oNode.ReadAttributeBase( _T("w:lastColumn"),          m_oLastColumn );
-				oNode.ReadAttributeBase( _T("w:lastRow"),             m_oLastRow );
-				oNode.ReadAttributeBase( _T("w:lastRowFirstColumn"),  m_oLastRowFirstColumn );
-				oNode.ReadAttributeBase( _T("w:lastRowLastColumn"),   m_oLastRowLastColumn );
-				oNode.ReadAttributeBase( _T("w:oddHBand"),            m_oOddHBand );
-				oNode.ReadAttributeBase( _T("w:oddVBand"),            m_oOddVBand );
-				oNode.ReadAttributeBase( _T("w:val"),                 m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:evenHBand"),           m_oEvenHBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:evenVBand"),           m_oEvenVBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstColumn"),         m_oFirstColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstRow"),            m_oFirstRow );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstRowFirstColumn"), m_oFirstRowFirstColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstRowLastColumn"),  m_oFirstRowLastColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastColumn"),          m_oLastColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastRow"),             m_oLastRow );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastRowFirstColumn"),  m_oLastRowFirstColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastRowLastColumn"),   m_oLastRowLastColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:oddHBand"),            m_oOddHBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:oddVBand"),            m_oOddVBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),                 m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1534,7 +1534,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1588,10 +1588,10 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-				oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-				oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-				oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+				XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1671,7 +1671,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1719,7 +1719,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1772,7 +1772,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1851,7 +1851,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1904,7 +1904,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1961,8 +1961,8 @@ namespace ComplexTypes
 		public:
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("x"), m_oX );
-				oNode.ReadAttributeBase( _T("y"), m_oY );
+				XmlMacroReadAttributeBase( oNode, _T("x"), m_oX );
+				XmlMacroReadAttributeBase( oNode, _T("y"), m_oY );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -2014,8 +2014,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("cx"), m_oCx );
-				oNode.ReadAttributeBase( _T("cy"), m_oCy );
+				XmlMacroReadAttributeBase( oNode, _T("cx"), m_oCx );
+				XmlMacroReadAttributeBase( oNode, _T("cy"), m_oCy );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/CustomXml.h b/Common/DocxFormat/Source/DocxFormat/CustomXml.h
index 7bf4d11438..ea9261d065 100644
--- a/Common/DocxFormat/Source/DocxFormat/CustomXml.h
+++ b/Common/DocxFormat/Source/DocxFormat/CustomXml.h
@@ -72,7 +72,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("ds:uri"), m_sUri );
+				XmlMacroReadAttributeBase( oNode, _T("ds:uri"), m_sUri );
 			}
 			virtual std::wstring      toXML() const
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Document.h b/Common/DocxFormat/Source/DocxFormat/Document.h
index 210a517a39..c072078a58 100644
--- a/Common/DocxFormat/Source/DocxFormat/Document.h
+++ b/Common/DocxFormat/Source/DocxFormat/Document.h
@@ -74,10 +74,10 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:color"),      m_oColor );
-				oNode.ReadAttributeBase( _T("w:themeColor"), m_oThemeColor );
-				oNode.ReadAttributeBase( _T("w:themeShade"), m_oThemeShade );
-				oNode.ReadAttributeBase( _T("w:themeTint"),  m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, _T("w:color"),      m_oColor );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeColor"), m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeShade"), m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeTint"),  m_oThemeTint );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h b/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h
index 3faf608e2a..671d31b6cf 100644
--- a/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h
+++ b/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h
@@ -63,10 +63,10 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("l"), m_oL );
-				oNode.ReadAttributeBase( _T("t"), m_oT );
-				oNode.ReadAttributeBase( _T("r"), m_oR );
-				oNode.ReadAttributeBase( _T("b"), m_oB );
+				XmlMacroReadAttributeBase( oNode, _T("l"), m_oL );
+				XmlMacroReadAttributeBase( oNode, _T("t"), m_oT );
+				XmlMacroReadAttributeBase( oNode, _T("r"), m_oR );
+				XmlMacroReadAttributeBase( oNode, _T("b"), m_oB );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -122,7 +122,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"relativeFrom",	m_oRelativeFrom );				
+				XmlMacroReadAttributeBase(node, L"relativeFrom",	m_oRelativeFrom );
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -245,7 +245,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"relativeFrom",	m_oRelativeFrom );				
+				XmlMacroReadAttributeBase(node, L"relativeFrom",	m_oRelativeFrom );
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -364,7 +364,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"relativeFrom",	m_oRelativeFrom );				
+				XmlMacroReadAttributeBase(node, L"relativeFrom",	m_oRelativeFrom );
 				
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -449,7 +449,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"relativeFrom",	m_oRelativeFrom );				
+				XmlMacroReadAttributeBase(node, L"relativeFrom",	m_oRelativeFrom );
 				
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -566,11 +566,11 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"distB",	m_oDistB );				
-				node.ReadAttributeBase( L"distL",	m_oDistL );				
-				node.ReadAttributeBase( L"distR",	m_oDistR );				
-				node.ReadAttributeBase( L"distT",	m_oDistT );				
-				node.ReadAttributeBase( L"wrapText",	m_oWrapText );	
+				XmlMacroReadAttributeBase(node, L"distB",	m_oDistB );
+				XmlMacroReadAttributeBase(node, L"distL",	m_oDistL );
+				XmlMacroReadAttributeBase(node, L"distR",	m_oDistR );
+				XmlMacroReadAttributeBase(node, L"distT",	m_oDistT );
+				XmlMacroReadAttributeBase(node, L"wrapText",	m_oWrapText );
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -668,7 +668,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"edited",	m_oEdited );	
+				XmlMacroReadAttributeBase(node, L"edited",	m_oEdited );
 
 				XmlUtils::CXmlNodes oNodes;
 				
@@ -771,9 +771,9 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"distL",		m_oDistL );				
-				node.ReadAttributeBase( L"distR",		m_oDistR );				
-				node.ReadAttributeBase( L"wrapText",	m_oWrapText );	
+				XmlMacroReadAttributeBase(node, L"distL",		m_oDistL );
+				XmlMacroReadAttributeBase(node, L"distR",		m_oDistR );
+				XmlMacroReadAttributeBase(node, L"wrapText",	m_oWrapText );
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -943,8 +943,8 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				node.ReadAttributeBase( L"distB",	m_oDistB );				
-				node.ReadAttributeBase( L"distT",	m_oDistT );				
+				XmlMacroReadAttributeBase(node, L"distB",	m_oDistB );
+				XmlMacroReadAttributeBase(node, L"distT",	m_oDistT );
 
 				XmlUtils::CXmlNodes oNodes;
 				if (node.GetNodes(_T("*"), oNodes))
@@ -1218,17 +1218,17 @@ namespace OOX
 			}
 			void ReadAttributes(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"allowOverlap",	m_oAllowOverlap );				
-				oNode.ReadAttributeBase( L"behindDoc",      m_oBehindDoc );
-				oNode.ReadAttributeBase( L"distB",          m_oDistB );
-				oNode.ReadAttributeBase( L"distL",          m_oDistL );
-				oNode.ReadAttributeBase( L"distR",          m_oDistR );
-				oNode.ReadAttributeBase( L"distT",          m_oDistT );
-				oNode.ReadAttributeBase( L"hidden",         m_oHidden );
-				oNode.ReadAttributeBase( L"layoutInCell",   m_oLayoutInCell );
-				oNode.ReadAttributeBase( L"locked",         m_oLocked );
-				oNode.ReadAttributeBase( L"relativeHeight", m_oRelativeHeight );
-				oNode.ReadAttributeBase( L"simplePos",      m_bSimplePos );
+				XmlMacroReadAttributeBase(oNode, L"allowOverlap",	m_oAllowOverlap );
+				XmlMacroReadAttributeBase(oNode, L"behindDoc",      m_oBehindDoc );
+				XmlMacroReadAttributeBase(oNode, L"distB",          m_oDistB );
+				XmlMacroReadAttributeBase(oNode, L"distL",          m_oDistL );
+				XmlMacroReadAttributeBase(oNode, L"distR",          m_oDistR );
+				XmlMacroReadAttributeBase(oNode, L"distT",          m_oDistT );
+				XmlMacroReadAttributeBase(oNode, L"hidden",         m_oHidden );
+				XmlMacroReadAttributeBase(oNode, L"layoutInCell",   m_oLayoutInCell );
+				XmlMacroReadAttributeBase(oNode, L"locked",         m_oLocked );
+				XmlMacroReadAttributeBase(oNode, L"relativeHeight", m_oRelativeHeight );
+				XmlMacroReadAttributeBase(oNode, L"simplePos",      m_bSimplePos );
 			}
 		public:
 			nullable<EAnchorWrapType>								m_eWrapType;
@@ -1358,10 +1358,10 @@ namespace OOX
 		private:
 			void ReadAttributes(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"distB",          m_oDistB );
-				oNode.ReadAttributeBase( L"distL",          m_oDistL );
-				oNode.ReadAttributeBase( L"distR",          m_oDistR );
-				oNode.ReadAttributeBase( L"distT",          m_oDistT );
+				XmlMacroReadAttributeBase(oNode, L"distB",          m_oDistB );
+				XmlMacroReadAttributeBase(oNode, L"distL",          m_oDistL );
+				XmlMacroReadAttributeBase(oNode, L"distR",          m_oDistR );
+				XmlMacroReadAttributeBase(oNode, L"distT",          m_oDistT );
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h b/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h
index f0c5d42ff1..ad3624e367 100644
--- a/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h
+++ b/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h
@@ -154,7 +154,7 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-                oNode.ReadAttributeBase( _T("uri"), m_sUri );
+				XmlMacroReadAttributeBase(oNode, _T("uri"), m_sUri );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
             virtual std::wstring toXML() const;
diff --git a/Common/DocxFormat/Source/DocxFormat/Font.h b/Common/DocxFormat/Source/DocxFormat/Font.h
index 6a0293194f..197eaf8cc6 100644
--- a/Common/DocxFormat/Source/DocxFormat/Font.h
+++ b/Common/DocxFormat/Source/DocxFormat/Font.h
@@ -57,37 +57,37 @@ namespace OOX
 			Reset();
 			if ( _T("w:font") == oNode.GetName() )
 			{
-				oNode.ReadAttributeBase( _T("w:name"), m_sName );
+				XmlMacroReadAttributeBase( oNode, _T("w:name"), m_sName );
 
 				XmlUtils::CXmlNode oChild;
 
 				if ( oNode.GetNode( _T("w:altName"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oAltName );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oAltName );
 
 				if ( oNode.GetNode( _T("w:charset"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oCharset );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oCharset );
 
 				if ( oNode.GetNode( _T("w:family"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oFamily );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oFamily );
 
 				if ( oNode.GetNode( _T("w:notTrueType"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oNotTrueType );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oNotTrueType );
 
 				if ( oNode.GetNode( _T("w:panose1"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oPanose );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oPanose );
 
 				if ( oNode.GetNode( _T("w:pitch"), oChild ) )
-					oChild.ReadAttributeBase( _T("w:val"), m_oPitch );
+					XmlMacroReadAttributeBase( oChild, _T("w:val"), m_oPitch );
 
 				if ( oNode.GetNode( _T("w:sig"), oChild ) )
 				{
-					oChild.ReadAttributeBase( _T("w:csb0"), m_oCsb0 );
-					oChild.ReadAttributeBase( _T("w:csb1"), m_oCsb1 );
+					XmlMacroReadAttributeBase( oChild, _T("w:csb0"), m_oCsb0 );
+					XmlMacroReadAttributeBase( oChild, _T("w:csb1"), m_oCsb1 );
 
-					oChild.ReadAttributeBase( _T("w:usb0"), m_oUsb0 );
-					oChild.ReadAttributeBase( _T("w:usb1"), m_oUsb1 );
-					oChild.ReadAttributeBase( _T("w:usb2"), m_oUsb2 );
-					oChild.ReadAttributeBase( _T("w:usb3"), m_oUsb3 );
+					XmlMacroReadAttributeBase( oChild, _T("w:usb0"), m_oUsb0 );
+					XmlMacroReadAttributeBase( oChild, _T("w:usb1"), m_oUsb1 );
+					XmlMacroReadAttributeBase( oChild, _T("w:usb2"), m_oUsb2 );
+					XmlMacroReadAttributeBase( oChild, _T("w:usb3"), m_oUsb3 );
 				}
 
 			}
diff --git a/Common/DocxFormat/Source/DocxFormat/FtnEdn.h b/Common/DocxFormat/Source/DocxFormat/FtnEdn.h
index 85b8a287f3..56a2b60d3c 100644
--- a/Common/DocxFormat/Source/DocxFormat/FtnEdn.h
+++ b/Common/DocxFormat/Source/DocxFormat/FtnEdn.h
@@ -86,8 +86,8 @@ namespace OOX
 			else 
 				return;
 
-			oNode.ReadAttributeBase( _T("w:id"),   m_oId   );
-			oNode.ReadAttributeBase( _T("w:type"), m_oType );
+			XmlMacroReadAttributeBase( oNode, _T("w:id"),   m_oId   );
+			XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
@@ -357,7 +357,7 @@ namespace OOX
 			else 
 				return;
 
-			oNode.ReadAttributeBase( _T("w:id"),   m_oId   );
+			XmlMacroReadAttributeBase( oNode, _T("w:id"),   m_oId   );
 		}
 		virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h b/Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h
index 0d85cdceec..a006f0df69 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h
@@ -68,8 +68,8 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -127,8 +127,8 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -192,7 +192,7 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:id", m_oId );
+				XmlMacroReadAttributeBase(oNode, L"w:id", m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -250,10 +250,10 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author", m_sAuthor );
-				oNode.ReadAttributeBase( L"w:date",   m_oDate );
-				oNode.ReadAttributeBase( L"w:id",     m_oID );
-				oNode.ReadAttributeBase( L"oouserid", m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author", m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:date",   m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:id",     m_oID );
+				XmlMacroReadAttributeBase( oNode, L"oouserid", m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -341,7 +341,7 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:id", m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:id", m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -399,10 +399,10 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author", m_sAuthor );
-				oNode.ReadAttributeBase( L"w:date",   m_oDate );
-				oNode.ReadAttributeBase( L"w:id",     m_oID );
-				oNode.ReadAttributeBase( L"oouserid", m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author", m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:date",   m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:id",     m_oID );
+				XmlMacroReadAttributeBase( oNode, L"oouserid", m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -489,7 +489,7 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:id", m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:id", m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -546,10 +546,10 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author", m_sAuthor );
-				oNode.ReadAttributeBase( L"w:date",   m_oDate );
-				oNode.ReadAttributeBase( L"w:id",     m_oID );
-				oNode.ReadAttributeBase( L"oouserid", m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author", m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:date",   m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:id",     m_oID );
+				XmlMacroReadAttributeBase( oNode, L"oouserid", m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -637,7 +637,7 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:id", m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:id", m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -694,10 +694,10 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author", m_sAuthor );
-				oNode.ReadAttributeBase( L"w:date",   m_oDate );
-				oNode.ReadAttributeBase( L"w:id",     m_oID );
-				oNode.ReadAttributeBase( L"oouserid", m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author", m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:date",   m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:id",     m_oID );
+				XmlMacroReadAttributeBase( oNode, L"oouserid", m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -785,8 +785,8 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -845,14 +845,14 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author",               m_sAuthor );
-				oNode.ReadAttributeBase( L"w:colFirst",             m_oColFirst );
-				oNode.ReadAttributeBase( L"w:colLast",              m_oColLast );
-				oNode.ReadAttributeBase( L"w:date",                 m_oDate );
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
-				oNode.ReadAttributeBase( L"w:name",                 m_sName );
-				oNode.ReadAttributeBase( L"oouserid",               m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author",               m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:colFirst",             m_oColFirst );
+				XmlMacroReadAttributeBase( oNode, L"w:colLast",              m_oColLast );
+				XmlMacroReadAttributeBase( oNode, L"w:date",                 m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:name",                 m_sName );
+				XmlMacroReadAttributeBase( oNode, L"oouserid",               m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -947,8 +947,8 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1006,14 +1006,14 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:author",               m_sAuthor );
-				oNode.ReadAttributeBase( L"w:colFirst",             m_oColFirst );
-				oNode.ReadAttributeBase( L"w:colLast",              m_oColLast );
-				oNode.ReadAttributeBase( L"w:date",                 m_oDate );
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
-				oNode.ReadAttributeBase( L"w:name",                 m_sName );
-				oNode.ReadAttributeBase( L"oouserid",               m_sUserId );
+				XmlMacroReadAttributeBase( oNode, L"w:author",               m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, L"w:colFirst",             m_oColFirst );
+				XmlMacroReadAttributeBase( oNode, L"w:colLast",              m_oColLast );
+				XmlMacroReadAttributeBase( oNode, L"w:date",                 m_oDate );
+				XmlMacroReadAttributeBase( oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase( oNode, L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase( oNode, L"w:name",                 m_sName );
+				XmlMacroReadAttributeBase( oNode, L"oouserid",               m_sUserId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1212,8 +1212,8 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase(oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase(oNode, L"w:id",                   m_oId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1280,11 +1280,11 @@ namespace OOX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:colFirst",             m_oColFirst );
-				oNode.ReadAttributeBase( L"w:colLast",              m_oColLast );
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_oId );
-				oNode.ReadAttributeBase( L"w:name",                 m_sName );
+				XmlMacroReadAttributeBase(oNode, L"w:colFirst",             m_oColFirst );
+				XmlMacroReadAttributeBase(oNode, L"w:colLast",              m_oColLast );
+				XmlMacroReadAttributeBase(oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase(oNode, L"w:id",                   m_oId );
+				XmlMacroReadAttributeBase(oNode, L"w:name",                 m_sName );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1358,8 +1358,8 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:id",                   m_sId );
+				XmlMacroReadAttributeBase(oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase(oNode, L"w:id",                   m_sId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1423,12 +1423,12 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:colFirst",             m_oColFirst );
-				oNode.ReadAttributeBase( L"w:colLast",              m_oColLast );
-				oNode.ReadAttributeBase( L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
-				oNode.ReadAttributeBase( L"w:ed",                   m_sEd );
-				oNode.ReadAttributeBase( L"w:edGrp",                m_oEdGrp );
-				oNode.ReadAttributeBase( L"w:id",                   m_sId );
+				XmlMacroReadAttributeBase(oNode, L"w:colFirst",             m_oColFirst );
+				XmlMacroReadAttributeBase(oNode, L"w:colLast",              m_oColLast );
+				XmlMacroReadAttributeBase(oNode, L"w:displacedbyCustomXml", m_oDisplacedByCustomXml );
+				XmlMacroReadAttributeBase(oNode, L"w:ed",                   m_sEd );
+				XmlMacroReadAttributeBase(oNode, L"w:edGrp",                m_oEdGrp );
+				XmlMacroReadAttributeBase(oNode, L"w:id",                   m_sId );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1501,7 +1501,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:type", m_oType );
+				XmlMacroReadAttributeBase(oNode, L"w:type", m_oType );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Bdo.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/Bdo.cpp
index 37d0ea0030..3a77e26bf2 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Bdo.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Bdo.cpp
@@ -58,7 +58,7 @@ namespace OOX
 
 		void    CBdo::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+            XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h b/Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h
index 923f3200cb..e6980140a8 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/FldChar.h
@@ -58,7 +58,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -111,8 +111,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:type"), m_oType );
-				oNode.ReadAttributeBase( _T("w:val"),  m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),  m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -174,7 +174,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"),  m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),  m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -227,8 +227,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:type"), m_oType );
-				oNode.ReadAttributeBase( _T("w:val"),  m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),  m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -290,7 +290,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"),  m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),  m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -787,9 +787,9 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:dirty"),       m_oDirty );
-				oNode.ReadAttributeBase( _T("w:fldCharType"), m_oFldCharType );
-				oNode.ReadAttributeBase( _T("w:fldLock"),     m_oFldLock );
+				XmlMacroReadAttributeBase( oNode, _T("w:dirty"),       m_oDirty );
+				XmlMacroReadAttributeBase( oNode, _T("w:fldCharType"), m_oFldCharType );
+				XmlMacroReadAttributeBase( oNode, _T("w:fldLock"),     m_oFldLock );
 
 				XmlUtils::CXmlNode oChild;
 				WritingElement_ReadNode( oNode, oChild, _T("w:ffData"), m_oFFData );
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/FldSimple.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/FldSimple.cpp
index b6531c621b..61d06aa29e 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/FldSimple.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/FldSimple.cpp
@@ -59,9 +59,9 @@ namespace OOX
 
 		void    CFldSimple::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:dirty"),   m_oDirty );
-			oNode.ReadAttributeBase( _T("w:fldLock"), m_oFldLock );
-			oNode.ReadAttributeBase( _T("w:instr"),   m_sInstr );
+            XmlMacroReadAttributeBase( oNode, _T("w:dirty"),   m_oDirty );
+            XmlMacroReadAttributeBase( oNode, _T("w:fldLock"), m_oFldLock );
+            XmlMacroReadAttributeBase( oNode, _T("w:instr"),   m_sInstr );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp
index ed67fcf405..51432d328f 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp
@@ -61,12 +61,12 @@ namespace OOX
 
 		void    CHyperlink::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:anchor"),      m_sAnchor );
-			oNode.ReadAttributeBase( _T("w:docLocation"), m_sDocLocation );
-			oNode.ReadAttributeBase( _T("w:history"),     m_oHistory );
-			oNode.ReadAttributeBase( _T("r:id"),          m_oId );
-			oNode.ReadAttributeBase( _T("w:tgtFrame"),    m_sTgtFrame );
-			oNode.ReadAttributeBase( _T("w:tooltip"),     m_sTooltip );
+            XmlMacroReadAttributeBase( oNode, _T("w:anchor"),      m_sAnchor );
+            XmlMacroReadAttributeBase( oNode, _T("w:docLocation"), m_sDocLocation );
+            XmlMacroReadAttributeBase( oNode, _T("w:history"),     m_oHistory );
+            XmlMacroReadAttributeBase( oNode, _T("r:id"),          m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("w:tgtFrame"),    m_sTgtFrame );
+            XmlMacroReadAttributeBase( oNode, _T("w:tooltip"),     m_sTooltip );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp
index 61e30179d6..be0cfb8c82 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp
@@ -62,11 +62,11 @@ namespace OOX
 		{
 			m_oParagraphProperty = NULL;
 
-			oNode.ReadAttributeBase( _T("w:rsidDel"),      m_oRsidDel );
-			oNode.ReadAttributeBase( _T("w:rsidP"),        m_oRsidP );
-			oNode.ReadAttributeBase( _T("w:rsidR"),        m_oRsidR );
-			oNode.ReadAttributeBase( _T("w:rsidRDefault"), m_oRsidRDefault );
-			oNode.ReadAttributeBase( _T("w:rsidRPr"),      m_oRsidRPr );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidDel"),      m_oRsidDel );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidP"),        m_oRsidP );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidR"),        m_oRsidR );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidRDefault"), m_oRsidRDefault );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidRPr"),      m_oRsidRPr );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp
index 6537d31d8a..738d76fe32 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp
@@ -76,10 +76,10 @@ namespace OOX
 			if ( _T("w:pPrChange") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_pPr;
 
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.h b/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.h
index cc6befda95..182335b205 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.h
@@ -61,21 +61,21 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:anchorLock"), m_oAnchorLock );
-				oNode.ReadAttributeBase( _T("w:dropCap"),    m_oDropCap );
-				oNode.ReadAttributeBase( _T("w:h"),          m_oH );
-				oNode.ReadAttributeBase( _T("w:hAnchor"),    m_oHAnchor );
-				oNode.ReadAttributeBase( _T("w:hRule"),      m_oHRule );
-				oNode.ReadAttributeBase( _T("w:hSpace"),     m_oHSpace );
-				oNode.ReadAttributeBase( _T("w:lines"),      m_oLines );
-				oNode.ReadAttributeBase( _T("w:vAnchor"),    m_oVAnchor );
-				oNode.ReadAttributeBase( _T("w:vSpace"),     m_oVSpace );
-				oNode.ReadAttributeBase( _T("w:w"),          m_oW );
-				oNode.ReadAttributeBase( _T("w:wrap"),       m_oWrap );
-				oNode.ReadAttributeBase( _T("w:x"),          m_oX );
-				oNode.ReadAttributeBase( _T("w:xAlign"),     m_oXAlign );
-				oNode.ReadAttributeBase( _T("w:y"),          m_oY );
-				oNode.ReadAttributeBase( _T("w:yAlign"),     m_oYAlign );
+				XmlMacroReadAttributeBase( oNode, _T("w:anchorLock"), m_oAnchorLock );
+				XmlMacroReadAttributeBase( oNode, _T("w:dropCap"),    m_oDropCap );
+				XmlMacroReadAttributeBase( oNode, _T("w:h"),          m_oH );
+				XmlMacroReadAttributeBase( oNode, _T("w:hAnchor"),    m_oHAnchor );
+				XmlMacroReadAttributeBase( oNode, _T("w:hRule"),      m_oHRule );
+				XmlMacroReadAttributeBase( oNode, _T("w:hSpace"),     m_oHSpace );
+				XmlMacroReadAttributeBase( oNode, _T("w:lines"),      m_oLines );
+				XmlMacroReadAttributeBase( oNode, _T("w:vAnchor"),    m_oVAnchor );
+				XmlMacroReadAttributeBase( oNode, _T("w:vSpace"),     m_oVSpace );
+				XmlMacroReadAttributeBase( oNode, _T("w:w"),          m_oW );
+				XmlMacroReadAttributeBase( oNode, _T("w:wrap"),       m_oWrap );
+				XmlMacroReadAttributeBase( oNode, _T("w:x"),          m_oX );
+				XmlMacroReadAttributeBase( oNode, _T("w:xAlign"),     m_oXAlign );
+				XmlMacroReadAttributeBase( oNode, _T("w:y"),          m_oY );
+				XmlMacroReadAttributeBase( oNode, _T("w:yAlign"),     m_oYAlign );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -253,24 +253,24 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:end"),            m_oEnd );
-				oNode.ReadAttributeBase( _T("w:endChars"),       m_oEndChars );
-				oNode.ReadAttributeBase( _T("w:firstLine"),      m_oFirstLine );
-				oNode.ReadAttributeBase( _T("w:firstLineChars"), m_oFirstLineChars );
-				oNode.ReadAttributeBase( _T("w:hanging"),        m_oHanging );
-				oNode.ReadAttributeBase( _T("w:hangingChars"),   m_oHangingChars );
-				oNode.ReadAttributeBase( _T("w:start"),          m_oStart );
-				oNode.ReadAttributeBase( _T("w:startChars"),     m_oStartChars );
+				XmlMacroReadAttributeBase( oNode, _T("w:end"),            m_oEnd );
+				XmlMacroReadAttributeBase( oNode, _T("w:endChars"),       m_oEndChars );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstLine"),      m_oFirstLine );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstLineChars"), m_oFirstLineChars );
+				XmlMacroReadAttributeBase( oNode, _T("w:hanging"),        m_oHanging );
+				XmlMacroReadAttributeBase( oNode, _T("w:hangingChars"),   m_oHangingChars );
+				XmlMacroReadAttributeBase( oNode, _T("w:start"),          m_oStart );
+				XmlMacroReadAttributeBase( oNode, _T("w:startChars"),     m_oStartChars );
 
 				// См. 9.2.1.2 Part4
 				if ( !m_oStart.IsInit() )
-					oNode.ReadAttributeBase( _T("w:left"), m_oStart );
+					XmlMacroReadAttributeBase( oNode, _T("w:left"), m_oStart );
 				if ( !m_oStartChars.IsInit() )
-					oNode.ReadAttributeBase( _T("w:leftChars"), m_oStartChars );
+					XmlMacroReadAttributeBase( oNode, _T("w:leftChars"), m_oStartChars );
 				if ( !m_oEnd.IsInit() )
-					oNode.ReadAttributeBase( _T("w:right"), m_oEnd );
+					XmlMacroReadAttributeBase( oNode, _T("w:right"), m_oEnd );
 				if ( !m_oEndChars.IsInit() )
-					oNode.ReadAttributeBase( _T("w:rightChars"), m_oEndChars );
+					XmlMacroReadAttributeBase( oNode, _T("w:rightChars"), m_oEndChars );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -415,14 +415,14 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:after"),             m_oAfter );
-				oNode.ReadAttributeBase( _T("w:afterAutospacing"),  m_oAfterAutospacing );
-				oNode.ReadAttributeBase( _T("w:afterLines"),        m_oAfterLines );
-				oNode.ReadAttributeBase( _T("w:before"),            m_oBefore );
-				oNode.ReadAttributeBase( _T("w:beforeAutospacing"), m_oBeforeAutospacing );
-				oNode.ReadAttributeBase( _T("w:beforeLines"),       m_oBeforeLines );
-				oNode.ReadAttributeBase( _T("w:line"),              m_oLine );
-				oNode.ReadAttributeBase( _T("w:lineRule"),          m_oLineRule );
+				XmlMacroReadAttributeBase( oNode, _T("w:after"),             m_oAfter );
+				XmlMacroReadAttributeBase( oNode, _T("w:afterAutospacing"),  m_oAfterAutospacing );
+				XmlMacroReadAttributeBase( oNode, _T("w:afterLines"),        m_oAfterLines );
+				XmlMacroReadAttributeBase( oNode, _T("w:before"),            m_oBefore );
+				XmlMacroReadAttributeBase( oNode, _T("w:beforeAutospacing"), m_oBeforeAutospacing );
+				XmlMacroReadAttributeBase( oNode, _T("w:beforeLines"),       m_oBeforeLines );
+				XmlMacroReadAttributeBase( oNode, _T("w:line"),              m_oLine );
+				XmlMacroReadAttributeBase( oNode, _T("w:lineRule"),          m_oLineRule );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -563,9 +563,9 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:leader"), m_oLeader );
-				oNode.ReadAttributeBase( _T("w:pos"),    m_oPos );
-				oNode.ReadAttributeBase( _T("w:val"),    m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:leader"), m_oLeader );
+				XmlMacroReadAttributeBase( oNode, _T("w:pos"),    m_oPos );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),    m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -636,7 +636,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -689,7 +689,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h b/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h
index dc5ae6d312..0842b64f0a 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h
@@ -61,9 +61,9 @@ namespace OOX
 
             virtual void fromXML(XmlUtils::CXmlNode &oNode)
 			{
-				oNode.ReadAttributeBase( _T("r:id"),      m_rId  );
-				oNode.ReadAttributeBase( _T("w:name"),    m_sName );
-				oNode.ReadAttributeBase( _T("w:shapeid"), m_sShapeId );
+				XmlMacroReadAttributeBase( oNode, _T("r:id"),      m_rId  );
+				XmlMacroReadAttributeBase( oNode, _T("w:name"),    m_sName );
+				XmlMacroReadAttributeBase( oNode, _T("w:shapeid"), m_sShapeId );
 			}
 
             virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Run.h b/Common/DocxFormat/Source/DocxFormat/Logic/Run.h
index 8da51eea55..5880aee603 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Run.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Run.h
@@ -98,9 +98,9 @@ namespace OOX
 			{
 				m_oRunProperty = NULL;
 				
-				oNode.ReadAttributeBase( _T("w:rsidDel"), m_oRsidDel );
-				oNode.ReadAttributeBase( _T("w:rsidR"),   m_oRsidR );
-				oNode.ReadAttributeBase( _T("w:rsidRPr"), m_oRsidRPr );
+				XmlMacroReadAttributeBase( oNode, _T("w:rsidDel"), m_oRsidDel );
+				XmlMacroReadAttributeBase( oNode, _T("w:rsidR"),   m_oRsidR );
+				XmlMacroReadAttributeBase( oNode, _T("w:rsidRPr"), m_oRsidRPr );
 
 				XmlUtils::CXmlNodes oChilds;
 				if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h b/Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
index f5d0ef358e..84eef56d88 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
@@ -56,8 +56,8 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode &oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:type"),  m_oType  );
-				oNode.ReadAttributeBase( _T("w:clear"), m_oClear );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"),  m_oType  );
+				XmlMacroReadAttributeBase( oNode, _T("w:clear"), m_oClear );
 			}
 
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
@@ -140,7 +140,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("r:id"), m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("r:id"), m_oId );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -315,7 +315,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("xml:space"), m_oSpace );
+				XmlMacroReadAttributeBase( oNode, _T("xml:space"), m_oSpace );
 
 				m_sText = oNode.GetText();
 			}
@@ -559,9 +559,9 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:alignment"),  m_oAlignment );
-				oNode.ReadAttributeBase( _T("w:leader"),     m_oLeader );
-				oNode.ReadAttributeBase( _T("w:relativeTo"), m_oRelativeTo );
+				XmlMacroReadAttributeBase( oNode, _T("w:alignment"),  m_oAlignment );
+				XmlMacroReadAttributeBase( oNode, _T("w:leader"),     m_oLeader );
+				XmlMacroReadAttributeBase( oNode, _T("w:relativeTo"), m_oRelativeTo );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -700,8 +700,8 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:char"), m_oChar );
-				oNode.ReadAttributeBase( _T("w:font"), m_oFont );
+				XmlMacroReadAttributeBase( oNode, _T("w:char"), m_oChar );
+				XmlMacroReadAttributeBase( oNode, _T("w:font"), m_oFont );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -778,7 +778,7 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("xml:space"), m_oSpace );
+				XmlMacroReadAttributeBase( oNode, _T("xml:space"), m_oSpace );
 
 				m_sText = oNode.GetText();
 			}
@@ -997,7 +997,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:id"), m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"), m_oId );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1101,7 +1101,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("xml:space"), m_oSpace );
+				XmlMacroReadAttributeBase( oNode, _T("xml:space"), m_oSpace );
 
 				m_sText = oNode.GetText();
 			}
@@ -1218,8 +1218,8 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:customMarkFollows"), m_oCustomMarkFollows );
-				oNode.ReadAttributeBase( _T("w:id"),                m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("w:customMarkFollows"), m_oCustomMarkFollows );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),                m_oId );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1332,8 +1332,8 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:customMarkFollows"), m_oCustomMarkFollows );
-				oNode.ReadAttributeBase( _T("w:id"),                m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("w:customMarkFollows"), m_oCustomMarkFollows );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),                m_oId );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1413,7 +1413,7 @@ namespace OOX
 
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("xml:space"), m_oSpace );
+				XmlMacroReadAttributeBase( oNode, _T("xml:space"), m_oSpace );
 
 				m_sText = oNode.GetText();
 			}
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.cpp
index 5ecfd96235..901105998c 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.cpp
@@ -67,10 +67,10 @@ namespace OOX
 			if ( _T("w:rPrChange") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_rPr;
 
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h b/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h
index e06d185920..ff18ebdd19 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/RunProperty.h
@@ -61,11 +61,11 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:combine"),         m_oCombine );
-				oNode.ReadAttributeBase( _T("w:combineBrackets"), m_oCombineBrackets );
-				oNode.ReadAttributeBase( _T("w:id"),              m_oID );
-				oNode.ReadAttributeBase( _T("w:vert"),            m_oVert );
-				oNode.ReadAttributeBase( _T("w:vertCompress"),    m_oVertCompress );
+				XmlMacroReadAttributeBase( oNode, _T("w:combine"),         m_oCombine );
+				XmlMacroReadAttributeBase( oNode, _T("w:combineBrackets"), m_oCombineBrackets );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),              m_oID );
+				XmlMacroReadAttributeBase( oNode, _T("w:vert"),            m_oVert );
+				XmlMacroReadAttributeBase( oNode, _T("w:vertCompress"),    m_oVertCompress );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -154,7 +154,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -208,7 +208,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -262,8 +262,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:id"),  m_oID );
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),  m_oID );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -326,7 +326,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -379,15 +379,15 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:ascii"),         m_sAscii );
-				oNode.ReadAttributeBase( _T("w:asciiTheme"),    m_oAsciiTheme );
-				oNode.ReadAttributeBase( _T("w:cs"),            m_sCs );
-				oNode.ReadAttributeBase( _T("w:cstheme"),       m_oCsTheme );
-				oNode.ReadAttributeBase( _T("w:eastAsia"),      m_sEastAsia );
-				oNode.ReadAttributeBase( _T("w:eastAsiaTheme"), m_oEastAsiaTheme );
-				oNode.ReadAttributeBase( _T("w:hAnsi"),         m_sHAnsi );
-				oNode.ReadAttributeBase( _T("w:hAnsiTheme"),    m_oHAnsiTheme );
-				oNode.ReadAttributeBase( _T("w:hint"),          m_oHint );
+				XmlMacroReadAttributeBase( oNode, _T("w:ascii"),         m_sAscii );
+				XmlMacroReadAttributeBase( oNode, _T("w:asciiTheme"),    m_oAsciiTheme );
+				XmlMacroReadAttributeBase( oNode, _T("w:cs"),            m_sCs );
+				XmlMacroReadAttributeBase( oNode, _T("w:cstheme"),       m_oCsTheme );
+				XmlMacroReadAttributeBase( oNode, _T("w:eastAsia"),      m_sEastAsia );
+				XmlMacroReadAttributeBase( oNode, _T("w:eastAsiaTheme"), m_oEastAsiaTheme );
+				XmlMacroReadAttributeBase( oNode, _T("w:hAnsi"),         m_sHAnsi );
+				XmlMacroReadAttributeBase( oNode, _T("w:hAnsiTheme"),    m_oHAnsiTheme );
+				XmlMacroReadAttributeBase( oNode, _T("w:hint"),          m_oHint );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -513,11 +513,11 @@ namespace ComplexTypes
 			}
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:color"),      m_oColor );
-				oNode.ReadAttributeBase( _T("w:themeColor"), m_oThemeColor );
-				oNode.ReadAttributeBase( _T("w:themeShade"), m_oThemeShade );
-				oNode.ReadAttributeBase( _T("w:themeTint"),  m_oThemeTint );
-				oNode.ReadAttributeBase( _T("w:val"),        m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:color"),      m_oColor );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeColor"), m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeShade"), m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, _T("w:themeTint"),  m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),        m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -605,7 +605,7 @@ namespace ComplexTypes
 			}
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"),        m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),        m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -657,7 +657,7 @@ namespace ComplexTypes
 			}
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Sdt.h b/Common/DocxFormat/Source/DocxFormat/Logic/Sdt.h
index 9a868b6079..2f8ec9e6fd 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Sdt.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Sdt.h
@@ -56,8 +56,8 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:displayText"), m_sDisplayText );
-				oNode.ReadAttributeBase( _T("w:value"),       m_sValue );
+				XmlMacroReadAttributeBase( oNode, _T("w:displayText"), m_sDisplayText );
+				XmlMacroReadAttributeBase( oNode, _T("w:value"),       m_sValue );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -119,9 +119,9 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:prefixMappings"), m_sPrefixMappings );
-				oNode.ReadAttributeBase( _T("w:storeItemID"),    m_sStoreItemID );
-				oNode.ReadAttributeBase( _T("w:xpath"),          m_sXPath );
+				XmlMacroReadAttributeBase( oNode, _T("w:prefixMappings"), m_sPrefixMappings );
+				XmlMacroReadAttributeBase( oNode, _T("w:storeItemID"),    m_sStoreItemID );
+				XmlMacroReadAttributeBase( oNode, _T("w:xpath"),          m_sXPath );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -190,7 +190,7 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -235,7 +235,7 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -279,7 +279,7 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -324,7 +324,7 @@ namespace ComplexTypes
 
 			virtual void FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:multiLine"), m_oMultiLine );
+				XmlMacroReadAttributeBase( oNode, _T("w:multiLine"), m_oMultiLine );
 			}
 			virtual void FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -391,7 +391,7 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:lastValue"), m_sLastValue );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastValue"), m_sLastValue );
 
 				XmlUtils::CXmlNodes oChilds;
 				if ( oNode.GetNodes( _T("w:listItem"), oChilds ) )
@@ -493,7 +493,7 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:fullDate"), m_oFullDate );
+				XmlMacroReadAttributeBase( oNode, _T("w:fullDate"), m_oFullDate );
 
 				XmlUtils::CXmlNode oChild;
 
@@ -675,7 +675,7 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:lastValue"), m_sLastValue );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastValue"), m_sLastValue );
 
 				XmlUtils::CXmlNodes oChilds;
 				if ( oNode.GetNodes( _T("w:listItem"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.cpp
index ff3ef28ffd..1ea7cee28e 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.cpp
@@ -63,10 +63,10 @@ namespace OOX
 		}
 		void CSectPrChange::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_sectPr;
 
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.h b/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.h
index 0e40fd6494..c402f45adb 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/SectionProperty.h
@@ -61,8 +61,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( L"w:space", m_oSpace );
-				oNode.ReadAttributeBase( L"w:w",     m_oW );
+				XmlMacroReadAttributeBase( oNode, L"w:space", m_oSpace );
+				XmlMacroReadAttributeBase( oNode, L"w:w",     m_oW );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -120,9 +120,9 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:charSpace"), m_oCharSpace );
-				oNode.ReadAttributeBase( (L"w:linePitch"), m_oLinePitch );
-				oNode.ReadAttributeBase( (L"w:type"),      m_oType );
+				XmlMacroReadAttributeBase( oNode, (L"w:charSpace"), m_oCharSpace );
+				XmlMacroReadAttributeBase( oNode, (L"w:linePitch"), m_oLinePitch );
+				XmlMacroReadAttributeBase( oNode, (L"w:type"),      m_oType );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -193,8 +193,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"r:id"),   m_oId );
-				oNode.ReadAttributeBase( (L"w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, (L"r:id"),   m_oId );
+				XmlMacroReadAttributeBase( oNode, (L"w:type"), m_oType );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -256,10 +256,10 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:countBy"),  m_oCountBy );
-				oNode.ReadAttributeBase( (L"w:distance"), m_oDistance );
-				oNode.ReadAttributeBase( (L"w:restart"),  m_oRestart );
-				oNode.ReadAttributeBase( (L"w:start"),    m_oStart );
+				XmlMacroReadAttributeBase( oNode, (L"w:countBy"),  m_oCountBy );
+				XmlMacroReadAttributeBase( oNode, (L"w:distance"), m_oDistance );
+				XmlMacroReadAttributeBase( oNode, (L"w:restart"),  m_oRestart );
+				XmlMacroReadAttributeBase( oNode, (L"w:start"),    m_oStart );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -340,8 +340,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:first"), m_oFirst );
-				oNode.ReadAttributeBase( (L"w:other"), m_oOther );
+				XmlMacroReadAttributeBase( oNode, (L"w:first"), m_oFirst );
+				XmlMacroReadAttributeBase( oNode, (L"w:other"), m_oOther );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -405,16 +405,16 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:color"),       m_oColor );
-				oNode.ReadAttributeBase( (L"w:frame"),       m_oFrame );
-				oNode.ReadAttributeBase( (L"r:id"),          m_oId );
-				oNode.ReadAttributeBase( (L"w:shadow"),      m_oShadow );
-				oNode.ReadAttributeBase( (L"w:space"),       m_oSpace );
-				oNode.ReadAttributeBase( (L"w:sz"),          m_oSz );
-				oNode.ReadAttributeBase( (L"w:themeColor"),  m_oThemeColor );
-				oNode.ReadAttributeBase( (L"w:themeShade"),  m_oThemeShade );
-				oNode.ReadAttributeBase( (L"w:themeTint"),   m_oThemeTint );
-				oNode.ReadAttributeBase( (L"w:val"),         m_oVal );
+				XmlMacroReadAttributeBase( oNode, (L"w:color"),       m_oColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:frame"),       m_oFrame );
+				XmlMacroReadAttributeBase( oNode, (L"r:id"),          m_oId );
+				XmlMacroReadAttributeBase( oNode, (L"w:shadow"),      m_oShadow );
+				XmlMacroReadAttributeBase( oNode, (L"w:space"),       m_oSpace );
+				XmlMacroReadAttributeBase( oNode, (L"w:sz"),          m_oSz );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeColor"),  m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeShade"),  m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeTint"),   m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, (L"w:val"),         m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -546,18 +546,18 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"r:bottomLeft"),  m_oBottomLeft );
-				oNode.ReadAttributeBase( (L"r:bottomRight"), m_oBottomRight );
-				oNode.ReadAttributeBase( (L"w:color"),       m_oColor );
-				oNode.ReadAttributeBase( (L"w:frame"),       m_oFrame );
-				oNode.ReadAttributeBase( (L"r:id"),          m_oId );
-				oNode.ReadAttributeBase( (L"w:shadow"),      m_oShadow );
-				oNode.ReadAttributeBase( (L"w:space"),       m_oSpace );
-				oNode.ReadAttributeBase( (L"w:sz"),          m_oSz );
-				oNode.ReadAttributeBase( (L"w:themeColor"),  m_oThemeColor );
-				oNode.ReadAttributeBase( (L"w:themeShade"),  m_oThemeShade );
-				oNode.ReadAttributeBase( (L"w:themeTint"),   m_oThemeTint );
-				oNode.ReadAttributeBase( (L"w:val"),         m_oVal );
+				XmlMacroReadAttributeBase( oNode, (L"r:bottomLeft"),  m_oBottomLeft );
+				XmlMacroReadAttributeBase( oNode, (L"r:bottomRight"), m_oBottomRight );
+				XmlMacroReadAttributeBase( oNode, (L"w:color"),       m_oColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:frame"),       m_oFrame );
+				XmlMacroReadAttributeBase( oNode, (L"r:id"),          m_oId );
+				XmlMacroReadAttributeBase( oNode, (L"w:shadow"),      m_oShadow );
+				XmlMacroReadAttributeBase( oNode, (L"w:space"),       m_oSpace );
+				XmlMacroReadAttributeBase( oNode, (L"w:sz"),          m_oSz );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeColor"),  m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeShade"),  m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeTint"),   m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, (L"w:val"),         m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -699,18 +699,18 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:color"),       m_oColor );
-				oNode.ReadAttributeBase( (L"w:frame"),       m_oFrame );
-				oNode.ReadAttributeBase( (L"r:id"),          m_oId );
-				oNode.ReadAttributeBase( (L"w:shadow"),      m_oShadow );
-				oNode.ReadAttributeBase( (L"w:space"),       m_oSpace );
-				oNode.ReadAttributeBase( (L"w:sz"),          m_oSz );
-				oNode.ReadAttributeBase( (L"w:themeColor"),  m_oThemeColor );
-				oNode.ReadAttributeBase( (L"w:themeShade"),  m_oThemeShade );
-				oNode.ReadAttributeBase( (L"w:themeTint"),   m_oThemeTint );
-				oNode.ReadAttributeBase( (L"r:topLeft"),     m_oTopLeft );
-				oNode.ReadAttributeBase( (L"r:topRight"),    m_oTopRight );
-				oNode.ReadAttributeBase( (L"w:val"),         m_oVal );
+				XmlMacroReadAttributeBase( oNode, (L"w:color"),       m_oColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:frame"),       m_oFrame );
+				XmlMacroReadAttributeBase( oNode, (L"r:id"),          m_oId );
+				XmlMacroReadAttributeBase( oNode, (L"w:shadow"),      m_oShadow );
+				XmlMacroReadAttributeBase( oNode, (L"w:space"),       m_oSpace );
+				XmlMacroReadAttributeBase( oNode, (L"w:sz"),          m_oSz );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeColor"),  m_oThemeColor );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeShade"),  m_oThemeShade );
+				XmlMacroReadAttributeBase( oNode, (L"w:themeTint"),   m_oThemeTint );
+				XmlMacroReadAttributeBase( oNode, (L"r:topLeft"),     m_oTopLeft );
+				XmlMacroReadAttributeBase( oNode, (L"r:topRight"),    m_oTopRight );
+				XmlMacroReadAttributeBase( oNode, (L"w:val"),         m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -852,13 +852,13 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:bottom"),  m_oBottom );
-				oNode.ReadAttributeBase( (L"w:footer"),  m_oFooter );
-				oNode.ReadAttributeBase( (L"w:gutter"),  m_oGutter );
-				oNode.ReadAttributeBase( (L"w:header"),  m_oHeader );
-				oNode.ReadAttributeBase( (L"w:left"),    m_oLeft   );
-				oNode.ReadAttributeBase( (L"w:right"),   m_oRight  );
-				oNode.ReadAttributeBase( (L"w:top"),     m_oTop    );
+				XmlMacroReadAttributeBase( oNode, (L"w:bottom"),  m_oBottom );
+				XmlMacroReadAttributeBase( oNode, (L"w:footer"),  m_oFooter );
+				XmlMacroReadAttributeBase( oNode, (L"w:gutter"),  m_oGutter );
+				XmlMacroReadAttributeBase( oNode, (L"w:header"),  m_oHeader );
+				XmlMacroReadAttributeBase( oNode, (L"w:left"),    m_oLeft   );
+				XmlMacroReadAttributeBase( oNode, (L"w:right"),   m_oRight  );
+				XmlMacroReadAttributeBase( oNode, (L"w:top"),     m_oTop    );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -966,10 +966,10 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:chapSep"),   m_oChapSep );
-				oNode.ReadAttributeBase( (L"w:chapStyle"), m_oChapStyle );
-				oNode.ReadAttributeBase( (L"w:fmt"),       m_oFmt );
-				oNode.ReadAttributeBase( (L"w:start"),     m_oStart );
+				XmlMacroReadAttributeBase( oNode, (L"w:chapSep"),   m_oChapSep );
+				XmlMacroReadAttributeBase( oNode, (L"w:chapStyle"), m_oChapStyle );
+				XmlMacroReadAttributeBase( oNode, (L"w:fmt"),       m_oFmt );
+				XmlMacroReadAttributeBase( oNode, (L"w:start"),     m_oStart );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1049,10 +1049,10 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:code"),   m_oCode );
-				oNode.ReadAttributeBase( (L"w:h"),      m_oH );
-				oNode.ReadAttributeBase( (L"w:orient"), m_oOrient );
-				oNode.ReadAttributeBase( (L"w:w"),      m_oW );
+				XmlMacroReadAttributeBase( oNode, (L"w:code"),   m_oCode );
+				XmlMacroReadAttributeBase( oNode, (L"w:h"),      m_oH );
+				XmlMacroReadAttributeBase( oNode, (L"w:orient"), m_oOrient );
+				XmlMacroReadAttributeBase( oNode, (L"w:w"),      m_oW );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1132,7 +1132,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, (L"w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1201,10 +1201,10 @@ namespace OOX
 		public:
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:equalWidth"), m_oEqualWidth );
-				oNode.ReadAttributeBase( (L"w:num"),        m_oNum );
-				oNode.ReadAttributeBase( (L"w:sep"),        m_oSep );
-				oNode.ReadAttributeBase( (L"w:space"),      m_oSpace );
+				XmlMacroReadAttributeBase( oNode, (L"w:equalWidth"), m_oEqualWidth );
+				XmlMacroReadAttributeBase( oNode, (L"w:num"),        m_oNum );
+				XmlMacroReadAttributeBase( oNode, (L"w:sep"),        m_oSep );
+				XmlMacroReadAttributeBase( oNode, (L"w:space"),      m_oSpace );
 
 				XmlUtils::CXmlNodes oCols;
 
@@ -1528,9 +1528,9 @@ namespace OOX
 		public:
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( (L"w:display"),    m_oDisplay );
-				oNode.ReadAttributeBase( (L"w:offsetFrom"), m_oOffsetFrom );
-				oNode.ReadAttributeBase( (L"w:zOrder"),     m_oZOrder );
+				XmlMacroReadAttributeBase( oNode, (L"w:display"),    m_oDisplay );
+				XmlMacroReadAttributeBase( oNode, (L"w:offsetFrom"), m_oOffsetFrom );
+				XmlMacroReadAttributeBase( oNode, (L"w:zOrder"),     m_oZOrder );
 
 				XmlUtils::CXmlNode oChild;
 
@@ -1753,10 +1753,10 @@ namespace OOX
 				if ( (L"w:sectPr") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( (L"w:rsidDel"),  m_oRsidDel );
-				oNode.ReadAttributeBase( (L"w:rsidR"),    m_oRsidR );
-				oNode.ReadAttributeBase( (L"w:rsidRPr"),  m_oRsidRPr );
-				oNode.ReadAttributeBase( (L"w:rsidSect"), m_oRsidSect );
+				XmlMacroReadAttributeBase( oNode, (L"w:rsidDel"),  m_oRsidDel );
+				XmlMacroReadAttributeBase( oNode, (L"w:rsidR"),    m_oRsidR );
+				XmlMacroReadAttributeBase( oNode, (L"w:rsidRPr"),  m_oRsidRPr );
+				XmlMacroReadAttributeBase( oNode, (L"w:rsidSect"), m_oRsidSect );
 
 				XmlUtils::CXmlNode oChild;
 
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/SmartTag.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/SmartTag.cpp
index e5f9bb7378..281c876e5b 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/SmartTag.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/SmartTag.cpp
@@ -61,8 +61,8 @@ namespace OOX
 
 		void    CSmartTag::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:element"),      m_sElement );
-			oNode.ReadAttributeBase( _T("w:uri"), m_sUri );
+            XmlMacroReadAttributeBase( oNode, _T("w:element"),      m_sElement );
+            XmlMacroReadAttributeBase( oNode, _T("w:uri"), m_sUri );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp
index b1448daa8f..e524a88c51 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp
@@ -101,7 +101,7 @@ namespace OOX
 		}
 		void CTblGridChange::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
 
 			XmlUtils::CXmlNode oNode_tblGrid;
 
@@ -174,10 +174,10 @@ namespace OOX
 		}
 		void CTblPrExChange::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_tblPrEx;
 
@@ -461,10 +461,10 @@ namespace OOX
 
 		void CTr::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:rsidDel"), m_oRsidDel );
-			oNode.ReadAttributeBase( _T("w:rsidR"),   m_oRsidR );
-			oNode.ReadAttributeBase( _T("w:rsidRPr"), m_oRsidRPr );
-			oNode.ReadAttributeBase( _T("w:rsidTr"),  m_oRsidTr );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidDel"), m_oRsidDel );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidR"),   m_oRsidR );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidRPr"), m_oRsidRPr );
+            XmlMacroReadAttributeBase( oNode, _T("w:rsidTr"),  m_oRsidTr );
 
 			XmlUtils::CXmlNodes oChilds;
 			int nNumCol = 0;
@@ -712,7 +712,7 @@ namespace OOX
 
 		void CTc::fromXML(XmlUtils::CXmlNode& oNode)
 		{
-			oNode.ReadAttributeBase( _T("w:id"), m_sId );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"), m_sId );
 
 			XmlUtils::CXmlNodes oChilds;
 			if ( oNode.GetNodes( _T("*"), oChilds ) )
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Table.h b/Common/DocxFormat/Source/DocxFormat/Logic/Table.h
index a1bfb8e909..7299fe63aa 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/Table.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/Table.h
@@ -57,7 +57,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:w"), m_oW );
+				XmlMacroReadAttributeBase( oNode, _T("w:w"), m_oW );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.cpp b/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.cpp
index 68ee6aa439..ca72b4f805 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.cpp
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.cpp
@@ -75,10 +75,10 @@ namespace OOX
 			if ( _T("w:tblPrChange") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_tblPr;
 
@@ -202,10 +202,10 @@ namespace OOX
 			if ( _T("w:trPrChange") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_tblPr;
 
@@ -331,10 +331,10 @@ namespace OOX
 			if ( _T("w:tcPrChange") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-			oNode.ReadAttributeBase( _T("w:date"),   m_oDate );
-			oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-			oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+            XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+            XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate );
+            XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+            XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 			XmlUtils::CXmlNode oNode_tcPr;
 
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.h b/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.h
index 2006308a9c..e63a13b8d2 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/TableProperty.h
@@ -58,7 +58,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -110,7 +110,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -162,13 +162,13 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:firstColumn"), m_oFirstColumn );
-				oNode.ReadAttributeBase( _T("w:firstRow"),    m_oFirstRow );
-				oNode.ReadAttributeBase( _T("w:lastColumn"),  m_oLastColumn );
-				oNode.ReadAttributeBase( _T("w:lastRow"),     m_oLastRow );
-				oNode.ReadAttributeBase( _T("w:noHBand"),     m_oNoHBand );
-				oNode.ReadAttributeBase( _T("w:noVBand"),     m_oNoVBand );
-				oNode.ReadAttributeBase( _T("w:val"),         m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstColumn"), m_oFirstColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:firstRow"),    m_oFirstRow );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastColumn"),  m_oLastColumn );
+				XmlMacroReadAttributeBase( oNode, _T("w:lastRow"),     m_oLastRow );
+				XmlMacroReadAttributeBase( oNode, _T("w:noHBand"),     m_oNoHBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:noVBand"),     m_oNoVBand );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),         m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -386,7 +386,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -451,16 +451,16 @@ namespace ComplexTypes
 			}
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:bottomFromText"), m_oBottomFromText );
-				oNode.ReadAttributeBase( _T("w:horzAnchor"),     m_oHorzAnchor );
-				oNode.ReadAttributeBase( _T("w:leftFromText"),   m_oLeftFromText );
-				oNode.ReadAttributeBase( _T("w:rightFromText"),  m_oRightFromText );
-				oNode.ReadAttributeBase( _T("w:tblpX"),          m_oTblpX );
-				oNode.ReadAttributeBase( _T("w:tblpXSpec"),      m_oTblpXSpec );
-				oNode.ReadAttributeBase( _T("w:tblpY"),          m_oTblpY );
-				oNode.ReadAttributeBase( _T("w:tblpYSpec"),      m_oTblpYSpec );
-				oNode.ReadAttributeBase( _T("w:topFromText"),    m_oTopFromText );
-				oNode.ReadAttributeBase( _T("w:vertAnchor"),     m_oVertAnchor );
+				XmlMacroReadAttributeBase( oNode, _T("w:bottomFromText"), m_oBottomFromText );
+				XmlMacroReadAttributeBase( oNode, _T("w:horzAnchor"),     m_oHorzAnchor );
+				XmlMacroReadAttributeBase( oNode, _T("w:leftFromText"),   m_oLeftFromText );
+				XmlMacroReadAttributeBase( oNode, _T("w:rightFromText"),  m_oRightFromText );
+				XmlMacroReadAttributeBase( oNode, _T("w:tblpX"),          m_oTblpX );
+				XmlMacroReadAttributeBase( oNode, _T("w:tblpXSpec"),      m_oTblpXSpec );
+				XmlMacroReadAttributeBase( oNode, _T("w:tblpY"),          m_oTblpY );
+				XmlMacroReadAttributeBase( oNode, _T("w:tblpYSpec"),      m_oTblpYSpec );
+				XmlMacroReadAttributeBase( oNode, _T("w:topFromText"),    m_oTopFromText );
+				XmlMacroReadAttributeBase( oNode, _T("w:vertAnchor"),     m_oVertAnchor );
 				PrepareAfterRead();
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
@@ -1086,8 +1086,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:hRule"), m_oHRule );
-				oNode.ReadAttributeBase( _T("w:val"),   m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:hRule"), m_oHRule );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),   m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1367,12 +1367,12 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:author"),     m_sAuthor );
-				oNode.ReadAttributeBase( _T("w:date"),       m_oDate );
-				oNode.ReadAttributeBase( _T("w:id"),         m_oId );
-				oNode.ReadAttributeBase( _T("w:vMerge"),     m_oVMerge );
-				oNode.ReadAttributeBase( _T("w:vMergeOrig"), m_oVMergeOrig );
-				oNode.ReadAttributeBase( _T("oouserid"),     m_sUserId );
+				XmlMacroReadAttributeBase( oNode, _T("w:author"),     m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, _T("w:date"),       m_oDate );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),         m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("w:vMerge"),     m_oVMerge );
+				XmlMacroReadAttributeBase( oNode, _T("w:vMergeOrig"), m_oVMergeOrig );
+				XmlMacroReadAttributeBase( oNode, _T("oouserid"),     m_sUserId );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1447,7 +1447,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -1496,7 +1496,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/VmlOfficeDrawing.h b/Common/DocxFormat/Source/DocxFormat/Logic/VmlOfficeDrawing.h
index 0b81e2aada..e9f7f6ca9c 100644
--- a/Common/DocxFormat/Source/DocxFormat/Logic/VmlOfficeDrawing.h
+++ b/Common/DocxFormat/Source/DocxFormat/Logic/VmlOfficeDrawing.h
@@ -1657,13 +1657,13 @@ namespace OOX
 				if ( _T("o:OLEObject") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("DrawAspect"), m_oDrawAspect );
-				oNode.ReadAttributeBase( _T("r:id"), m_oId );
-				oNode.ReadAttributeBase( _T("ObjectID"), m_sObjectId );
-				oNode.ReadAttributeBase( _T("ProgID"), m_sProgId );
-				oNode.ReadAttributeBase( _T("ShapeID"), m_sShapeId );
-				oNode.ReadAttributeBase( _T("Type"), m_oType );
-				oNode.ReadAttributeBase( _T("UpdateMode"), m_oUpdateMode );
+				XmlMacroReadAttributeBase( oNode, _T("DrawAspect"), m_oDrawAspect );
+				XmlMacroReadAttributeBase( oNode, _T("r:id"), m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("ObjectID"), m_sObjectId );
+				XmlMacroReadAttributeBase( oNode, _T("ProgID"), m_sProgId );
+				XmlMacroReadAttributeBase( oNode, _T("ShapeID"), m_sShapeId );
+				XmlMacroReadAttributeBase( oNode, _T("Type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("UpdateMode"), m_oUpdateMode );
 
 				//todo FieldCodes, LinkType, LockedField
 			}
@@ -2180,19 +2180,19 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase(L"o:addlxml", m_sAddXml);
-				oNode.ReadAttributeBase(L"allowcomments", m_oAllowComments);
-				oNode.ReadAttributeBase(L"v:ext", m_oExt);
-				oNode.ReadAttributeBase(L"id", m_oId);
-				oNode.ReadAttributeBase(L"issignatureline", m_oIsSignatureLine);
-				oNode.ReadAttributeBase(L"provid", m_oProvId);
-				oNode.ReadAttributeBase(L"showsigndate", m_oShowSignDate);
-				oNode.ReadAttributeBase(L"o:signinginstructions", m_sSigningInstructions);
-				oNode.ReadAttributeBase(L"signinginstructionsset", m_oSigningInstructionsSet);
-				oNode.ReadAttributeBase(L"o:sigprovurl", m_sSigProvUrl);
-				oNode.ReadAttributeBase(L"o:suggestedsigner", m_sSuggestedSigner);
-				oNode.ReadAttributeBase(L"o:suggestedsigner2", m_sSuggestedSigner2);
-				oNode.ReadAttributeBase(L"o:suggestedsigneremail", m_sSuggestedSignerEmail);
+				XmlMacroReadAttributeBase(oNode, L"o:addlxml", m_sAddXml);
+				XmlMacroReadAttributeBase(oNode, L"allowcomments", m_oAllowComments);
+				XmlMacroReadAttributeBase(oNode, L"v:ext", m_oExt);
+				XmlMacroReadAttributeBase(oNode, L"id", m_oId);
+				XmlMacroReadAttributeBase(oNode, L"issignatureline", m_oIsSignatureLine);
+				XmlMacroReadAttributeBase(oNode, L"provid", m_oProvId);
+				XmlMacroReadAttributeBase(oNode, L"showsigndate", m_oShowSignDate);
+				XmlMacroReadAttributeBase(oNode, L"o:signinginstructions", m_sSigningInstructions);
+				XmlMacroReadAttributeBase(oNode, L"signinginstructionsset", m_oSigningInstructionsSet);
+				XmlMacroReadAttributeBase(oNode, L"o:sigprovurl", m_sSigProvUrl);
+				XmlMacroReadAttributeBase(oNode, L"o:suggestedsigner", m_sSuggestedSigner);
+				XmlMacroReadAttributeBase(oNode, L"o:suggestedsigner2", m_sSuggestedSigner2);
+				XmlMacroReadAttributeBase(oNode, L"o:suggestedsigneremail", m_sSuggestedSignerEmail);
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Math/oMathBottomNodes.h b/Common/DocxFormat/Source/DocxFormat/Math/oMathBottomNodes.h
index 6e188a99a0..e449a641a8 100644
--- a/Common/DocxFormat/Source/DocxFormat/Math/oMathBottomNodes.h
+++ b/Common/DocxFormat/Source/DocxFormat/Math/oMathBottomNodes.h
@@ -167,7 +167,7 @@ namespace OOX
 				else if ( _T("m:zeroWid") == sNodeName )
 					eType = et_m_zeroWid;
 
-				oNode.ReadAttributeBase( _T("m:val"), m_val );
+				XmlMacroReadAttributeBase( oNode, _T("m:val"), m_val );
 			}
 			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h b/Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
index bbf2eb70b5..58f1039809 100644
--- a/Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
+++ b/Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
@@ -653,7 +653,7 @@ namespace OOX
 			}
 			virtual void  fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("m:alnAt"), m_alnAt );
+				XmlMacroReadAttributeBase( oNode, _T("m:alnAt"), m_alnAt );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -1910,7 +1910,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("m:val"), m_val );
+				XmlMacroReadAttributeBase( oNode, _T("m:val"), m_val );
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) 
 			{
@@ -3016,7 +3016,7 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("xml:space"), m_oSpace );
+				XmlMacroReadAttributeBase( oNode, _T("xml:space"), m_oSpace );
 
 				m_sText = oNode.GetText();
 			}
@@ -3444,10 +3444,10 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-				oNode.ReadAttributeBase( _T("w:date"),   m_oDate  );
-				oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-				oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+				XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate  );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 				m_oRun = oNode;
 			}
@@ -3536,10 +3536,10 @@ namespace OOX
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:author"), m_sAuthor );
-				oNode.ReadAttributeBase( _T("w:date"),   m_oDate  );
-				oNode.ReadAttributeBase( _T("w:id"),     m_oId );
-				oNode.ReadAttributeBase( _T("oouserid"), m_sUserId );
+				XmlMacroReadAttributeBase( oNode, _T("w:author"), m_sAuthor );
+				XmlMacroReadAttributeBase( oNode, _T("w:date"),   m_oDate  );
+				XmlMacroReadAttributeBase( oNode, _T("w:id"),     m_oId );
+				XmlMacroReadAttributeBase( oNode, _T("oouserid"), m_sUserId );
 
 				m_oRun = oNode;
 			}
diff --git a/Common/DocxFormat/Source/DocxFormat/Numbering.h b/Common/DocxFormat/Source/DocxFormat/Numbering.h
index 2817e40eba..f50825e133 100644
--- a/Common/DocxFormat/Source/DocxFormat/Numbering.h
+++ b/Common/DocxFormat/Source/DocxFormat/Numbering.h
@@ -59,9 +59,9 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:legacy"),       m_oLegacy );
-				oNode.ReadAttributeBase( _T("w:legacyIndent"), m_oLegacyIndent );
-				oNode.ReadAttributeBase( _T("w:legacySpace"),  m_oLegacySpace );
+				XmlMacroReadAttributeBase( oNode, _T("w:legacy"),       m_oLegacy );
+				XmlMacroReadAttributeBase( oNode, _T("w:legacyIndent"), m_oLegacyIndent );
+				XmlMacroReadAttributeBase( oNode, _T("w:legacySpace"),  m_oLegacySpace );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -115,8 +115,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:null"), m_oNull );
-				oNode.ReadAttributeBase( _T("w:val"),  m_sVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:null"), m_oNull );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),  m_sVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -173,7 +173,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -221,7 +221,7 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"), m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"), m_oVal );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -280,9 +280,9 @@ namespace OOX
 				if ( _T("w:lvl") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("w:ilvl"),      m_oIlvl );
-				oNode.ReadAttributeBase( _T("w:tentative"), m_oTentative );
-				oNode.ReadAttributeBase( _T("w:tplc"),      m_oTplc );
+				XmlMacroReadAttributeBase( oNode, _T("w:ilvl"),      m_oIlvl );
+				XmlMacroReadAttributeBase( oNode, _T("w:tentative"), m_oTentative );
+				XmlMacroReadAttributeBase( oNode, _T("w:tplc"),      m_oTplc );
 
 				XmlUtils::CXmlNode oChild;
 				
@@ -419,7 +419,7 @@ namespace OOX
 				if ( _T("w:abstractNum") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("w:abstractNumId"), m_oAbstractNumId );
+				XmlMacroReadAttributeBase( oNode, _T("w:abstractNumId"), m_oAbstractNumId );
 
 				XmlUtils::CXmlNode oChild;
 				
@@ -544,7 +544,7 @@ namespace OOX
 				if ( _T("w:lvlOverride") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("w:ilvl"), m_oIlvl );
+				XmlMacroReadAttributeBase( oNode, _T("w:ilvl"), m_oIlvl );
 
 				XmlUtils::CXmlNode oChild;
 				
@@ -634,7 +634,7 @@ namespace OOX
 				if ( _T("w:num") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("w:numId"), m_oNumId );
+				XmlMacroReadAttributeBase( oNode, _T("w:numId"), m_oNumId );
 
 				XmlUtils::CXmlNode oChild;
 				
@@ -737,7 +737,7 @@ namespace OOX
 		public:
 			virtual void         fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:numPicBulletId"), m_oNumPicBulletId );
+				XmlMacroReadAttributeBase( oNode, _T("w:numPicBulletId"), m_oNumPicBulletId );
 
 				XmlUtils::CXmlNode oChild;
 				
diff --git a/Common/DocxFormat/Source/DocxFormat/Rels.h b/Common/DocxFormat/Source/DocxFormat/Rels.h
index 81d340d0de..c543dca76a 100644
--- a/Common/DocxFormat/Source/DocxFormat/Rels.h
+++ b/Common/DocxFormat/Source/DocxFormat/Rels.h
@@ -79,10 +79,10 @@ namespace OOX
 			}
             virtual void fromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("Id"),         m_rId );
-				oNode.ReadAttributeBase( _T("Target"),     m_oTarget );
-				oNode.ReadAttributeBase( _T("Type"),       m_sType );
-				oNode.ReadAttributeBase( _T("TargetMode"), m_sMode );
+				XmlMacroReadAttributeBase( oNode,  _T("Id"),         m_rId );
+				XmlMacroReadAttributeBase( oNode,  _T("Target"),     m_oTarget );
+				XmlMacroReadAttributeBase( oNode,  _T("Type"),       m_sType );
+				XmlMacroReadAttributeBase( oNode,  _T("TargetMode"), m_sMode );
 			}
             virtual std::wstring toXML() const
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h b/Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h
index a8654c8597..b5f5aa38e5 100644
--- a/Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h
+++ b/Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h
@@ -106,8 +106,8 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:val"),    m_oVal );
-				oNode.ReadAttributeBase( _T("w:target"), m_oTarget );
+				XmlMacroReadAttributeBase( oNode, _T("w:val"),    m_oVal );
+				XmlMacroReadAttributeBase( oNode, _T("w:target"), m_oTarget );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
diff --git a/Common/DocxFormat/Source/DocxFormat/Styles.h b/Common/DocxFormat/Source/DocxFormat/Styles.h
index d1bf4afa43..e52ce9383e 100644
--- a/Common/DocxFormat/Source/DocxFormat/Styles.h
+++ b/Common/DocxFormat/Source/DocxFormat/Styles.h
@@ -61,12 +61,12 @@ namespace ComplexTypes
 
 			virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 			{
-				oNode.ReadAttributeBase( _T("w:locked"),         m_oLocked );
-				oNode.ReadAttributeBase( _T("w:name"),           m_sName );
-				oNode.ReadAttributeBase( _T("w:qFormat"),        m_oQFormat );
-				oNode.ReadAttributeBase( _T("w:semiHidden"),     m_oSemiHidden );
-				oNode.ReadAttributeBase( _T("w:uiPriority"),     m_oUiPriority );
-				oNode.ReadAttributeBase( _T("w:unhideWhenUsed"), m_oUnhideWhenUsed );
+				XmlMacroReadAttributeBase( oNode, _T("w:locked"),         m_oLocked );
+				XmlMacroReadAttributeBase( oNode, _T("w:name"),           m_sName );
+				XmlMacroReadAttributeBase( oNode, _T("w:qFormat"),        m_oQFormat );
+				XmlMacroReadAttributeBase( oNode, _T("w:semiHidden"),     m_oSemiHidden );
+				XmlMacroReadAttributeBase( oNode, _T("w:uiPriority"),     m_oUiPriority );
+				XmlMacroReadAttributeBase( oNode, _T("w:unhideWhenUsed"), m_oUnhideWhenUsed );
 			}
 			virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -164,7 +164,7 @@ namespace OOX
 				if ( _T("w:tblStylePr") != oNode.GetName() )
 					return;
 
-				oNode.ReadAttributeBase( _T("w:type"), m_oType );
+				XmlMacroReadAttributeBase( oNode, _T("w:type"), m_oType );
 
 				XmlUtils::CXmlNode oChild;
 				WritingElement_ReadNode( oNode, oChild, _T("w:pPr"),   m_oParPr );
@@ -430,12 +430,12 @@ namespace OOX
 			if ( _T("w:latentStyles") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:count"),             m_oCount );
-			oNode.ReadAttributeBase( _T("w:defLockedState"),    m_oDefLockedState );
-			oNode.ReadAttributeBase( _T("w:defQFormat"),        m_oDefQFormat );
-			oNode.ReadAttributeBase( _T("w:defSemiHidden"),     m_oDefSemiHidden );
-			oNode.ReadAttributeBase( _T("w:defUIPriority"),     m_oDefUiPriority );
-			oNode.ReadAttributeBase( _T("w:defUnhideWhenUsed"), m_oDefUnhideWhenUsed );
+			XmlMacroReadAttributeBase( oNode, _T("w:count"),             m_oCount );
+			XmlMacroReadAttributeBase( oNode, _T("w:defLockedState"),    m_oDefLockedState );
+			XmlMacroReadAttributeBase( oNode, _T("w:defQFormat"),        m_oDefQFormat );
+			XmlMacroReadAttributeBase( oNode, _T("w:defSemiHidden"),     m_oDefSemiHidden );
+			XmlMacroReadAttributeBase( oNode, _T("w:defUIPriority"),     m_oDefUiPriority );
+			XmlMacroReadAttributeBase( oNode, _T("w:defUnhideWhenUsed"), m_oDefUnhideWhenUsed );
 
 			XmlUtils::CXmlNodes oList;
 			if ( oNode.GetNodes( _T("w:lsdException"), oList ) )
@@ -579,10 +579,10 @@ namespace OOX
 			if ( _T("w:style") != oNode.GetName() )
 				return;
 
-			oNode.ReadAttributeBase( _T("w:customStyle"), m_oCustomStyle );
-			oNode.ReadAttributeBase( _T("w:default"),     m_oDefault );
-			oNode.ReadAttributeBase( _T("w:styleId"),     m_sStyleId );
-			oNode.ReadAttributeBase( _T("w:type"),        m_oType );
+			XmlMacroReadAttributeBase( oNode, _T("w:customStyle"), m_oCustomStyle );
+			XmlMacroReadAttributeBase( oNode, _T("w:default"),     m_oDefault );
+			XmlMacroReadAttributeBase( oNode, _T("w:styleId"),     m_sStyleId );
+			XmlMacroReadAttributeBase( oNode, _T("w:type"),        m_oType );
 
 			XmlUtils::CXmlNode oChild;
 
diff --git a/Common/DocxFormat/Source/XlsxFormat/ComplexTypes_Spreadsheet.h b/Common/DocxFormat/Source/XlsxFormat/ComplexTypes_Spreadsheet.h
index c777c00677..16578d376a 100644
--- a/Common/DocxFormat/Source/XlsxFormat/ComplexTypes_Spreadsheet.h
+++ b/Common/DocxFormat/Source/XlsxFormat/ComplexTypes_Spreadsheet.h
@@ -62,7 +62,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -105,7 +105,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -153,7 +153,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_sVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_sVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -211,7 +211,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -260,7 +260,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -309,7 +309,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -358,7 +358,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -407,7 +407,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -456,7 +456,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -505,7 +505,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
@@ -554,7 +554,7 @@ namespace ComplexTypes
 
 				virtual void    FromXML(XmlUtils::CXmlNode& oNode)
 				{
-					oNode.ReadAttributeBase( _T("val"), m_oVal );
+					XmlMacroReadAttributeBase( oNode, _T("val"), m_oVal );
 				}
 				virtual void    FromXML(XmlUtils::CXmlLiteReader& oReader)
 				{
diff --git a/DesktopEditor/graphics/pro/Fonts.h b/DesktopEditor/graphics/pro/Fonts.h
index a8aef0ffb8..b254f3ad2b 100644
--- a/DesktopEditor/graphics/pro/Fonts.h
+++ b/DesktopEditor/graphics/pro/Fonts.h
@@ -385,8 +385,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontPath
     {
     public:
-        IFontPath() {}
-        virtual ~IFontPath() {}
+        IFontPath();
+        virtual ~IFontPath();
 
     public:
         virtual int ToInterface(ISimpleGraphicsPath* pPath) = 0;
@@ -403,8 +403,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontStream
     {
     public:
-        IFontStream() {}
-        virtual ~IFontStream() {}
+        IFontStream();
+        virtual ~IFontStream();
 
         virtual int AddRef() = 0;
         virtual int Release() = 0;
@@ -416,8 +416,8 @@ namespace NSFonts
     class GRAPHICS_DECL IApplicationFontStreams
     {
     public:
-        IApplicationFontStreams() {}
-        virtual ~IApplicationFontStreams() {}
+        IApplicationFontStreams();
+        virtual ~IApplicationFontStreams();
 
     public:
         virtual IFontStream* GetStream(const std::wstring& strFile) = 0;
@@ -441,8 +441,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontFile
     {
     public:
-        IFontFile() {}
-        virtual ~IFontFile() {}
+        IFontFile();
+        virtual ~IFontFile();
 
     public:
         virtual std::string GetStyleName() = 0;
@@ -480,8 +480,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontsCache
     {
     public:
-        IFontsCache() {}
-        virtual ~IFontsCache() {}
+        IFontsCache();
+        virtual ~IFontsCache();
 
         virtual void Clear() = 0;
         virtual void SetCacheSize(const int& lMaxSize) = 0;
@@ -503,8 +503,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontManager
     {
     public:
-        IFontManager() {}
-        virtual ~IFontManager() {}
+        IFontManager();
+        virtual ~IFontManager();
 
         virtual IFontsCache* GetCache() = 0;
         virtual IApplicationFonts* GetApplication() = 0;
@@ -579,8 +579,8 @@ namespace NSFonts
     class GRAPHICS_DECL IFontList
     {
     public:
-        IFontList() {}
-        ~IFontList() {}
+        IFontList();
+        virtual ~IFontList();
 
     public:
 		virtual std::vector<NSFonts::CFontInfo*>* GetFonts() = 0;
@@ -591,8 +591,8 @@ namespace NSFonts
     class GRAPHICS_DECL IApplicationFonts
     {
     public:
-        IApplicationFonts() {}
-        ~IApplicationFonts() {}
+        IApplicationFonts();
+        virtual ~IApplicationFonts();
 
     public:
         virtual IFontsCache* GetCache() = 0;
diff --git a/DesktopEditor/graphics/pro/pro_Fonts.cpp b/DesktopEditor/graphics/pro/pro_Fonts.cpp
index e749e1a873..5b302b775d 100644
--- a/DesktopEditor/graphics/pro/pro_Fonts.cpp
+++ b/DesktopEditor/graphics/pro/pro_Fonts.cpp
@@ -49,6 +49,8 @@ namespace NSFonts
 
 namespace NSFonts
 {
+    IFontPath::IFontPath() {}
+    IFontPath::~IFontPath() {}
     namespace NSFontPath
     {
         IFontPath* Create()
@@ -57,6 +59,8 @@ namespace NSFonts
         }
     }
 
+    IFontStream::IFontStream() {}
+    IFontStream::~IFontStream() {}
     namespace NSStream
     {
         IFontStream* Create()
@@ -65,6 +69,8 @@ namespace NSFonts
         }
     }
 
+    IApplicationFontStreams::IApplicationFontStreams() {}
+    IApplicationFontStreams::~IApplicationFontStreams() {}
     namespace NSApplicationFontStream
     {
         IApplicationFontStreams* Create()
@@ -73,6 +79,8 @@ namespace NSFonts
         }
     }
 
+    IFontFile::IFontFile() {}
+    IFontFile::~IFontFile() {}
     namespace NSFontFile
     {
         IFontFile* Create()
@@ -81,6 +89,8 @@ namespace NSFonts
         }
     }
 
+    IFontsCache::IFontsCache() {}
+    IFontsCache::~IFontsCache() {}
     namespace NSFontCache
     {
         IFontsCache* Create()
@@ -89,6 +99,8 @@ namespace NSFonts
         }
     }
 
+    IFontManager::IFontManager() {}
+    IFontManager::~IFontManager() {}
     namespace NSFontManager
     {
         IFontManager* Create()
@@ -97,6 +109,11 @@ namespace NSFonts
         }
     }
 
+    IFontList::IFontList() {}
+    IFontList::~IFontList() {}
+
+    IApplicationFonts::IApplicationFonts() {}
+    IApplicationFonts::~IApplicationFonts() {}
     namespace NSApplication
     {
         IApplicationFonts* Create()
diff --git a/DesktopEditor/xml/include/xmlutils.h b/DesktopEditor/xml/include/xmlutils.h
index 8f9704eb34..07a93dcef7 100644
--- a/DesktopEditor/xml/include/xmlutils.h
+++ b/DesktopEditor/xml/include/xmlutils.h
@@ -33,6 +33,7 @@
 #define _BUILD_XMLUTILS_CROSSPLATFORM_H_
 
 #include <vector>
+#include <list>
 #include <map>
 #include <string>
 
@@ -136,6 +137,7 @@ namespace XmlUtils
 
 	public:
 		CXmlNodes();
+		~CXmlNodes();
 		bool IsValid();
 		int GetCount();
 		bool GetAt(int nIndex, CXmlNode& oXmlNode);
@@ -174,6 +176,10 @@ namespace XmlUtils
 		std::wstring ReadAttribute(const std::wstring& strAttibuteName);
 
 		int GetAttributesCount();
+		void GetAllAttributes(std::vector<std::wstring>& names, std::vector<std::wstring>& values);
+		void GetAllAttributes(std::vector<std::string>& names, std::vector<std::string>& values);
+		void GetAllAttributes(std::list<std::wstring>& names, std::list<std::wstring>& values);
+		void GetAllAttributes(std::list<std::string>& names, std::list<std::string>& values);
 		
 		std::string GetAttributeA(const std::string& sName, const std::string& _default = "");
 		std::string GetAttributeA(const std::wstring& sName, const std::string& _default = "");
@@ -218,26 +224,12 @@ namespace XmlUtils
 
 		CXmlNode& operator=(const CXmlNode& oSrc);
 
-public:
+    public:
         std::wstring private_GetXml();
         std::wstring private_GetXml(const std::wstring& strDefaultValue = L"");
         std::wstring private_GetXmlFast();
         std::wstring private_GetXmlFast(const std::wstring& strDefaultValue);
 
-public:
-        template <typename T>
-        void LoadArray(const std::wstring& sName, std::vector<T>& arList);
-        template <typename T>
-        void LoadArray(const std::wstring& sName, const std::wstring& sSubName, std::vector<T>& arList);
-        template<typename T>
-        void ReadAttributeBase(const wchar_t* bsName, T& value);
-        template<typename T>
-        void ReadAllAttributes(T& strNames, T& strValues);
-        template<typename T>
-        void ReadAllAttributesA(T& strNames, T& strValues);
-        template <typename T>
-        void ReadNodeValueBase(const wchar_t* bsName, T& value);
-
 	private:
 		void SetBase(CXmlNodeBase* pBase);
 		std::wstring GetNamespace(const std::wstring& strNodeName);
@@ -274,6 +266,38 @@ public:
 
 	std::wstring KERNEL_DECL GetNameNoNS(const std::wstring & strNodeName);
 	std::wstring KERNEL_DECL GetNamespace(const std::wstring& strNodeName);
+
+    #define XmlMacroLoadArray(node, name, list, type)   \
+    {                                                   \
+        XmlUtils::CXmlNodes oNodes;                     \
+        if (node.GetNodes(name, oNodes))                \
+        {                                               \
+            int nCount = oNodes.GetCount();             \
+            for (int i = 0; i < nCount; ++i)            \
+            {                                           \
+                XmlUtils::CXmlNode oItem;               \
+                oNodes.GetAt(i, oItem);                 \
+                list.push_back(type());                 \
+                list[i].fromXML(oItem);                 \
+            }                                           \
+        }                                               \
+    }
+    #define XmlMacroLoadArrayS(node, name, subname, list, type)     \
+    {                                                               \
+        XmlUtils::CXmlNode oNode;                                   \
+        if (node.GetNode(sName, oNode))                             \
+            LoadArrayMacro(oNode, subname, list, type);             \
+    }
+    #define XmlMacroReadAttributeBase(node, name, value)    \
+    {                                                       \
+        std::wstring sAttr;                                 \
+        if (node.GetAttributeIfExist(name, sAttr))          \
+            value = sAttr;                                  \
+    }
+    #define XmlMacroReadNodeValueBase(node, name, value)    \
+    {                                                       \
+        value = node.ReadNodeTextBase(name);                \
+    }
 }
 
 #endif // _BUILD_XMLUTILS_CROSSPLATFORM_H_
diff --git a/DesktopEditor/xml/src/xmldom.cpp b/DesktopEditor/xml/src/xmldom.cpp
index 51704599c4..1db7d9a84a 100644
--- a/DesktopEditor/xml/src/xmldom.cpp
+++ b/DesktopEditor/xml/src/xmldom.cpp
@@ -147,6 +147,9 @@ namespace XmlUtils
 	CXmlNodes::CXmlNodes() : m_nodes()
 	{
 	}
+    CXmlNodes::~CXmlNodes()
+    {
+    }
 	bool CXmlNodes::IsValid()
 	{
 		return true;
@@ -490,6 +493,38 @@ namespace XmlUtils
 		else 
 			return 0;
 	}
+    void CXmlNode::GetAllAttributes(std::vector<std::wstring>& names, std::vector<std::wstring>& values)
+    {
+        for (std::map<std::string, std::string>::iterator p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
+        {
+            names.push_back(UTF8_TO_U(p->first));
+            values.push_back(UTF8_TO_U(p->second));
+        }
+    }
+    void CXmlNode::GetAllAttributes(std::vector<std::string>& names, std::vector<std::string>& values)
+    {
+        for (std::map<std::string, std::string>::iterator p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
+        {
+            names.push_back(p->first);
+            values.push_back(p->second);
+        }
+    }
+    void CXmlNode::GetAllAttributes(std::list<std::wstring>& names, std::list<std::wstring>& values)
+    {
+        for (std::map<std::string, std::string>::iterator p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
+        {
+            names.push_back(UTF8_TO_U(p->first));
+            values.push_back(UTF8_TO_U(p->second));
+        }
+    }
+    void CXmlNode::GetAllAttributes(std::list<std::string>& names, std::list<std::string>& values)
+    {
+        for (std::map<std::string, std::string>::iterator p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
+        {
+            names.push_back(p->first);
+            values.push_back(p->second);
+        }
+    }
 	bool CXmlNode::GetAttributeIfExist(const std::wstring& sName, std::wstring& sOutput)
 	{
 		bool bRes = false;
@@ -795,70 +830,7 @@ namespace XmlUtils
 		NSStringUtils::CStringBuilder oWriter;
 		m_pBase->GetXml(oWriter);
 		return oWriter.GetData();
-	}
-
-    template <typename T>
-    void CXmlNode::LoadArray(const std::wstring& sName, std::vector<T>& arList)
-    {
-        CXmlNodes oNodes;
-        if (GetNodes(sName, oNodes))
-        {
-            int nCount = oNodes.GetCount();
-            for (int i = 0; i < nCount; ++i)
-            {
-                CXmlNode oItem;
-                oNodes.GetAt(i, oItem);
-
-                arList.push_back(T());
-                arList[i].fromXML(oItem);
-            }
-        }
-    }
-    template <typename T>
-    void CXmlNode::LoadArray(const std::wstring& sName, const std::wstring& sSubName, std::vector<T>& arList)
-    {
-        CXmlNode oNode;
-        if (GetNode(sName, oNode))
-            oNode.LoadArray(sSubName, arList);
-    }
-    template<typename T>
-    void CXmlNode::ReadAttributeBase(const wchar_t* bsName, T& value)
-    {
-        std::wstring sAttr;
-        if (GetAttributeIfExist(bsName, sAttr))
-            value = sAttr;
-    }
-    template<typename T>
-    void CXmlNode::ReadAllAttributes(T& strNames, T& strValues)
-    {
-        if (!IsValid())
-            return;
-
-        std::map<std::string, std::string>::iterator p;
-        for (p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
-        {
-            strNames.push_back  (NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)p->first.c_str(), (long)p->first.length()));
-            strValues.push_back (NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)p->second.c_str(), (long)p->second.length()));
-        }
-    }
-    template<typename T>
-    void CXmlNode::ReadAllAttributesA(T& strNames, T& strValues)
-    {
-        if (!IsValid())
-            return;
-
-        std::map<std::string, std::string>::iterator p;
-        for (p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
-        {
-            strNames.push_back(p->first);
-            strValues.push_back(p->second);
-        }
-    }
-    template <typename T>
-    void CXmlNode::ReadNodeValueBase(const wchar_t* bsName, T& value)
-    {
-        value = ReadNodeTextBase(bsName);
-    }
+	}    
 
 	void CXmlNode::SetBase(CXmlNodeBase* pBase)
 	{