diff --git a/OOXML/PPTXFormat/Limit/BaseLimit.h b/OOXML/PPTXFormat/Limit/BaseLimit.h
index fb5eace367..1af6cc650d 100644
--- a/OOXML/PPTXFormat/Limit/BaseLimit.h
+++ b/OOXML/PPTXFormat/Limit/BaseLimit.h
@@ -33,13 +33,6 @@
 
 #include <string>
 
-// TODO delete define
-#define _USE_STRING_OPERATOR                            \
-	virtual void operator=(const std::wstring& value)	\
-	{                                                   \
-		set(value);                                     \
-	}
-
 #define DEFINE_LIMIT_PVIRTUAL												\
 	using BaseLimit::operator=;												\
 	virtual void set(const std::wstring& strValue);							\
@@ -66,7 +59,6 @@ namespace PPTX
 			virtual ~BaseLimit();
 
 			BaseLimit& operator=(const BaseLimit& oSrc);
-
 			void operator=(const std::wstring& str);
 
 			virtual void set(const std::wstring& strValue) = 0;
diff --git a/OOXML/PPTXFormat/Limit/pro/pptx_limits.cpp b/OOXML/PPTXFormat/Limit/pro/pptx_limits.cpp
new file mode 100644
index 0000000000..b71d0036ef
--- /dev/null
+++ b/OOXML/PPTXFormat/Limit/pro/pptx_limits.cpp
@@ -0,0 +1,89 @@
+
+#include "../../../PPTXFormat/Limit/AlbumLayout.cpp"
+#include "../../../PPTXFormat/Limit/AnimationDgmBuild.cpp"
+#include "../../../PPTXFormat/Limit/BaseLimit.cpp"
+#include "../../../PPTXFormat/Limit/BevelType.cpp"
+#include "../../../PPTXFormat/Limit/BlendMode.cpp"
+#include "../../../PPTXFormat/Limit/BlipCompression.cpp"
+#include "../../../PPTXFormat/Limit/BWMode.cpp"
+#include "../../../PPTXFormat/Limit/CameraType.cpp"
+#include "../../../PPTXFormat/Limit/ChartBuild.cpp"
+#include "../../../PPTXFormat/Limit/ChartBuildType.cpp"
+#include "../../../PPTXFormat/Limit/ColorSchemeIndex.cpp"
+#include "../../../PPTXFormat/Limit/CompoundLine.cpp"
+#include "../../../PPTXFormat/Limit/Conformance.cpp"
+#include "../../../PPTXFormat/Limit/ContentStatus.cpp"
+#include "../../../PPTXFormat/Limit/CornerDirectionVal.cpp"
+#include "../../../PPTXFormat/Limit/DgmBuild.cpp"
+#include "../../../PPTXFormat/Limit/DgmBuildType.cpp"
+#include "../../../PPTXFormat/Limit/EffectContainerType.cpp"
+#include "../../../PPTXFormat/Limit/EightDirectionVal.cpp"
+#include "../../../PPTXFormat/Limit/FillPath.cpp"
+#include "../../../PPTXFormat/Limit/Flip.cpp"
+#include "../../../PPTXFormat/Limit/FontAlign.cpp"
+#include "../../../PPTXFormat/Limit/FontStyleIndex.cpp"
+#include "../../../PPTXFormat/Limit/FrameShape.cpp"
+#include "../../../PPTXFormat/Limit/HorzOverflow.cpp"
+#include "../../../PPTXFormat/Limit/InOutDirectionVal.cpp"
+#include "../../../PPTXFormat/Limit/IterateType.cpp"
+#include "../../../PPTXFormat/Limit/LastView.cpp"
+#include "../../../PPTXFormat/Limit/LightRigType.cpp"
+#include "../../../PPTXFormat/Limit/LineCap.cpp"
+#include "../../../PPTXFormat/Limit/LineEndSize.cpp"
+#include "../../../PPTXFormat/Limit/LineEndType.cpp"
+#include "../../../PPTXFormat/Limit/Material.cpp"
+#include "../../../PPTXFormat/Limit/OnOff.cpp"
+#include "../../../PPTXFormat/Limit/Orient.cpp"
+#include "../../../PPTXFormat/Limit/ParaBuildType.cpp"
+#include "../../../PPTXFormat/Limit/PathFillMode.cpp"
+#include "../../../PPTXFormat/Limit/PattFillVal.cpp"
+#include "../../../PPTXFormat/Limit/PenAlign.cpp"
+#include "../../../PPTXFormat/Limit/PlaceholderSize.cpp"
+#include "../../../PPTXFormat/Limit/PlaceholderType.cpp"
+#include "../../../PPTXFormat/Limit/PresetShadowVal.cpp"
+#include "../../../PPTXFormat/Limit/PrstClrVal.cpp"
+#include "../../../PPTXFormat/Limit/PrstDashVal.cpp"
+#include "../../../PPTXFormat/Limit/RectAlign.cpp"
+#include "../../../PPTXFormat/Limit/SchemeClrVal.cpp"
+#include "../../../PPTXFormat/Limit/ShapeType.cpp"
+#include "../../../PPTXFormat/Limit/SideDirectionVal.cpp"
+#include "../../../PPTXFormat/Limit/SlideLayoutType.cpp"
+#include "../../../PPTXFormat/Limit/SlideSize.cpp"
+#include "../../../PPTXFormat/Limit/SplitterBarState.cpp"
+#include "../../../PPTXFormat/Limit/SysClrVal.cpp"
+#include "../../../PPTXFormat/Limit/TextAlign.cpp"
+#include "../../../PPTXFormat/Limit/TextAnchor.cpp"
+#include "../../../PPTXFormat/Limit/TextAutonumberScheme.cpp"
+#include "../../../PPTXFormat/Limit/TextCaps.cpp"
+#include "../../../PPTXFormat/Limit/TextShapeType.cpp"
+#include "../../../PPTXFormat/Limit/TextStrike.cpp"
+#include "../../../PPTXFormat/Limit/TextTabAlignType.cpp"
+#include "../../../PPTXFormat/Limit/TextUnderline.cpp"
+#include "../../../PPTXFormat/Limit/TextVerticalType.cpp"
+#include "../../../PPTXFormat/Limit/TextWrap.cpp"
+#include "../../../PPTXFormat/Limit/TLAccumulate.cpp"
+#include "../../../PPTXFormat/Limit/TLAdditive.cpp"
+#include "../../../PPTXFormat/Limit/TLCalcMode.cpp"
+#include "../../../PPTXFormat/Limit/TLChartSubElement.cpp"
+#include "../../../PPTXFormat/Limit/TLColorDirection.cpp"
+#include "../../../PPTXFormat/Limit/TLColorSpace.cpp"
+#include "../../../PPTXFormat/Limit/TLCommandType.cpp"
+#include "../../../PPTXFormat/Limit/TLMasterRelation.cpp"
+#include "../../../PPTXFormat/Limit/TLNextAc.cpp"
+#include "../../../PPTXFormat/Limit/TLNodeFillType.cpp"
+#include "../../../PPTXFormat/Limit/TLNodeType.cpp"
+#include "../../../PPTXFormat/Limit/TLOrigin.cpp"
+#include "../../../PPTXFormat/Limit/TLOverride.cpp"
+#include "../../../PPTXFormat/Limit/TLPathEditMode.cpp"
+#include "../../../PPTXFormat/Limit/TLPresetClass.cpp"
+#include "../../../PPTXFormat/Limit/TLPrevAc.cpp"
+#include "../../../PPTXFormat/Limit/TLRestart.cpp"
+#include "../../../PPTXFormat/Limit/TLRuntimeTrigger.cpp"
+#include "../../../PPTXFormat/Limit/TLSyncBehavior.cpp"
+#include "../../../PPTXFormat/Limit/TLTransform.cpp"
+#include "../../../PPTXFormat/Limit/TLTransition.cpp"
+#include "../../../PPTXFormat/Limit/TLTriggerEvent.cpp"
+#include "../../../PPTXFormat/Limit/TLValueType.cpp"
+#include "../../../PPTXFormat/Limit/TransitionSpeed.cpp"
+#include "../../../PPTXFormat/Limit/VariantType.cpp"
+#include "../../../PPTXFormat/Limit/VertOverflow.cpp"
diff --git a/OOXML/PPTXFormat/Limit/pro/pptx_limits.pri b/OOXML/PPTXFormat/Limit/pro/pptx_limits.pri
new file mode 100644
index 0000000000..590d661c44
--- /dev/null
+++ b/OOXML/PPTXFormat/Limit/pro/pptx_limits.pri
@@ -0,0 +1,188 @@
+
+LIMITS_DIR = $$PWD/..
+
+HEADERS += \
+	$$LIMITS_DIR/AlbumLayout.h \
+	$$LIMITS_DIR/AnimationDgmBuild.h \
+	$$LIMITS_DIR/BaseLimit.h \
+	$$LIMITS_DIR/BevelType.h \
+	$$LIMITS_DIR/BlendMode.h \
+	$$LIMITS_DIR/BlipCompression.h \
+	$$LIMITS_DIR/BWMode.h \
+	$$LIMITS_DIR/CameraType.h \
+	$$LIMITS_DIR/ChartBuild.h \
+	$$LIMITS_DIR/ChartBuildType.h \
+	$$LIMITS_DIR/ColorSchemeIndex.h \
+	$$LIMITS_DIR/CompoundLine.h \
+	$$LIMITS_DIR/Conformance.h \
+	$$LIMITS_DIR/ContentStatus.h \
+	$$LIMITS_DIR/CornerDirectionVal.h \
+	$$LIMITS_DIR/DgmBuild.h \
+	$$LIMITS_DIR/DgmBuildType.h \
+	$$LIMITS_DIR/EffectContainerType.h \
+	$$LIMITS_DIR/EightDirectionVal.h \
+	$$LIMITS_DIR/FillPath.h \
+	$$LIMITS_DIR/Flip.h \
+	$$LIMITS_DIR/FontAlign.h \
+	$$LIMITS_DIR/FontStyleIndex.h \
+	$$LIMITS_DIR/FrameShape.h \
+	$$LIMITS_DIR/HorzOverflow.h \
+	$$LIMITS_DIR/InOutDirectionVal.h \
+	$$LIMITS_DIR/IterateType.h \
+	$$LIMITS_DIR/LastView.h \
+	$$LIMITS_DIR/LightRigType.h \
+	$$LIMITS_DIR/LineCap.h \
+	$$LIMITS_DIR/LineEndSize.h \
+	$$LIMITS_DIR/LineEndType.h \
+	$$LIMITS_DIR/Material.h \
+	$$LIMITS_DIR/OnOff.h \
+	$$LIMITS_DIR/Orient.h \
+	$$LIMITS_DIR/ParaBuildType.h \
+	$$LIMITS_DIR/PathFillMode.h \
+	$$LIMITS_DIR/PattFillVal.h \
+	$$LIMITS_DIR/PenAlign.h \
+	$$LIMITS_DIR/PlaceholderSize.h \
+	$$LIMITS_DIR/PlaceholderType.h \
+	$$LIMITS_DIR/PresetShadowVal.h \
+	$$LIMITS_DIR/PrstClrVal.h \
+	$$LIMITS_DIR/PrstDashVal.h \
+	$$LIMITS_DIR/RectAlign.h \
+	$$LIMITS_DIR/SchemeClrVal.h \
+	$$LIMITS_DIR/ShapeType.h \
+	$$LIMITS_DIR/SideDirectionVal.h \
+	$$LIMITS_DIR/SlideLayoutType.h \
+	$$LIMITS_DIR/SlideSize.h \
+	$$LIMITS_DIR/SplitterBarState.h \
+	$$LIMITS_DIR/SysClrVal.h \
+	$$LIMITS_DIR/TextAlign.h \
+	$$LIMITS_DIR/TextAnchor.h \
+	$$LIMITS_DIR/TextAutonumberScheme.h \
+	$$LIMITS_DIR/TextCaps.h \
+	$$LIMITS_DIR/TextShapeType.h \
+	$$LIMITS_DIR/TextStrike.h \
+	$$LIMITS_DIR/TextTabAlignType.h \
+	$$LIMITS_DIR/TextUnderline.h \
+	$$LIMITS_DIR/TextVerticalType.h \
+	$$LIMITS_DIR/TextWrap.h \
+	$$LIMITS_DIR/TLAccumulate.h \
+	$$LIMITS_DIR/TLAdditive.h \
+	$$LIMITS_DIR/TLCalcMode.h \
+	$$LIMITS_DIR/TLChartSubElement.h \
+	$$LIMITS_DIR/TLColorDirection.h \
+	$$LIMITS_DIR/TLColorSpace.h \
+	$$LIMITS_DIR/TLCommandType.h \
+	$$LIMITS_DIR/TLMasterRelation.h \
+	$$LIMITS_DIR/TLNextAc.h \
+	$$LIMITS_DIR/TLNodeFillType.h \
+	$$LIMITS_DIR/TLNodeType.h \
+	$$LIMITS_DIR/TLOrigin.h \
+	$$LIMITS_DIR/TLOverride.h \
+	$$LIMITS_DIR/TLPathEditMode.h \
+	$$LIMITS_DIR/TLPresetClass.h \
+	$$LIMITS_DIR/TLPrevAc.h \
+	$$LIMITS_DIR/TLRestart.h \
+	$$LIMITS_DIR/TLRuntimeTrigger.h \
+	$$LIMITS_DIR/TLSyncBehavior.h \
+	$$LIMITS_DIR/TLTransform.h \
+	$$LIMITS_DIR/TLTransition.h \
+	$$LIMITS_DIR/TLTriggerEvent.h \
+	$$LIMITS_DIR/TLValueType.h \
+	$$LIMITS_DIR/TransitionSpeed.h \
+	$$LIMITS_DIR/VariantType.h \
+	$$LIMITS_DIR/VertOverflow.h
+
+core_release {
+SOURCES += $$PWD/pptx_limits.cpp
+}
+
+core_debug {
+SOURCES += \
+	$$LIMITS_DIR/AlbumLayout.cpp \
+	$$LIMITS_DIR/AnimationDgmBuild.cpp \
+	$$LIMITS_DIR/BaseLimit.cpp \
+	$$LIMITS_DIR/BevelType.cpp \
+	$$LIMITS_DIR/BlendMode.cpp \
+	$$LIMITS_DIR/BlipCompression.cpp \
+	$$LIMITS_DIR/BWMode.cpp \
+	$$LIMITS_DIR/CameraType.cpp \
+	$$LIMITS_DIR/ChartBuild.cpp \
+	$$LIMITS_DIR/ChartBuildType.cpp \
+	$$LIMITS_DIR/ColorSchemeIndex.cpp \
+	$$LIMITS_DIR/CompoundLine.cpp \
+	$$LIMITS_DIR/Conformance.cpp \
+	$$LIMITS_DIR/ContentStatus.cpp \
+	$$LIMITS_DIR/CornerDirectionVal.cpp \
+	$$LIMITS_DIR/DgmBuild.cpp \
+	$$LIMITS_DIR/DgmBuildType.cpp \
+	$$LIMITS_DIR/EffectContainerType.cpp \
+	$$LIMITS_DIR/EightDirectionVal.cpp \
+	$$LIMITS_DIR/FillPath.cpp \
+	$$LIMITS_DIR/Flip.cpp \
+	$$LIMITS_DIR/FontAlign.cpp \
+	$$LIMITS_DIR/FontStyleIndex.cpp \
+	$$LIMITS_DIR/FrameShape.cpp \
+	$$LIMITS_DIR/HorzOverflow.cpp \
+	$$LIMITS_DIR/InOutDirectionVal.cpp \
+	$$LIMITS_DIR/IterateType.cpp \
+	$$LIMITS_DIR/LastView.cpp \
+	$$LIMITS_DIR/LightRigType.cpp \
+	$$LIMITS_DIR/LineCap.cpp \
+	$$LIMITS_DIR/LineEndSize.cpp \
+	$$LIMITS_DIR/LineEndType.cpp \
+	$$LIMITS_DIR/Material.cpp \
+	$$LIMITS_DIR/OnOff.cpp \
+	$$LIMITS_DIR/Orient.cpp \
+	$$LIMITS_DIR/ParaBuildType.cpp \
+	$$LIMITS_DIR/PathFillMode.cpp \
+	$$LIMITS_DIR/PattFillVal.cpp \
+	$$LIMITS_DIR/PenAlign.cpp \
+	$$LIMITS_DIR/PlaceholderSize.cpp \
+	$$LIMITS_DIR/PlaceholderType.cpp \
+	$$LIMITS_DIR/PresetShadowVal.cpp \
+	$$LIMITS_DIR/PrstClrVal.cpp \
+	$$LIMITS_DIR/PrstDashVal.cpp \
+	$$LIMITS_DIR/RectAlign.cpp \
+	$$LIMITS_DIR/SchemeClrVal.cpp \
+	$$LIMITS_DIR/ShapeType.cpp \
+	$$LIMITS_DIR/SideDirectionVal.cpp \
+	$$LIMITS_DIR/SlideLayoutType.cpp \
+	$$LIMITS_DIR/SlideSize.cpp \
+	$$LIMITS_DIR/SplitterBarState.cpp \
+	$$LIMITS_DIR/SysClrVal.cpp \
+	$$LIMITS_DIR/TextAlign.cpp \
+	$$LIMITS_DIR/TextAnchor.cpp \
+	$$LIMITS_DIR/TextAutonumberScheme.cpp \
+	$$LIMITS_DIR/TextCaps.cpp \
+	$$LIMITS_DIR/TextShapeType.cpp \
+	$$LIMITS_DIR/TextStrike.cpp \
+	$$LIMITS_DIR/TextTabAlignType.cpp \
+	$$LIMITS_DIR/TextUnderline.cpp \
+	$$LIMITS_DIR/TextVerticalType.cpp \
+	$$LIMITS_DIR/TextWrap.cpp \
+	$$LIMITS_DIR/TLAccumulate.cpp \
+	$$LIMITS_DIR/TLAdditive.cpp \
+	$$LIMITS_DIR/TLCalcMode.cpp \
+	$$LIMITS_DIR/TLChartSubElement.cpp \
+	$$LIMITS_DIR/TLColorDirection.cpp \
+	$$LIMITS_DIR/TLColorSpace.cpp \
+	$$LIMITS_DIR/TLCommandType.cpp \
+	$$LIMITS_DIR/TLMasterRelation.cpp \
+	$$LIMITS_DIR/TLNextAc.cpp \
+	$$LIMITS_DIR/TLNodeFillType.cpp \
+	$$LIMITS_DIR/TLNodeType.cpp \
+	$$LIMITS_DIR/TLOrigin.cpp \
+	$$LIMITS_DIR/TLOverride.cpp \
+	$$LIMITS_DIR/TLPathEditMode.cpp \
+	$$LIMITS_DIR/TLPresetClass.cpp \
+	$$LIMITS_DIR/TLPrevAc.cpp \
+	$$LIMITS_DIR/TLRestart.cpp \
+	$$LIMITS_DIR/TLRuntimeTrigger.cpp \
+	$$LIMITS_DIR/TLSyncBehavior.cpp \
+	$$LIMITS_DIR/TLTransform.cpp \
+	$$LIMITS_DIR/TLTransition.cpp \
+	$$LIMITS_DIR/TLTriggerEvent.cpp \
+	$$LIMITS_DIR/TLValueType.cpp \
+	$$LIMITS_DIR/TransitionSpeed.cpp \
+	$$LIMITS_DIR/VariantType.cpp \
+	$$LIMITS_DIR/VertOverflow.cpp
+}
diff --git a/OOXML/PPTXFormat/Logic/Pic.cpp b/OOXML/PPTXFormat/Logic/Pic.cpp
index 0f179cdf69..c3e12fb978 100644
--- a/OOXML/PPTXFormat/Logic/Pic.cpp
+++ b/OOXML/PPTXFormat/Logic/Pic.cpp
@@ -68,6 +68,114 @@
 
 namespace PPTX
 {
+	namespace Limit
+	{
+		OLEDrawAspectType::OLEDrawAspectType()
+		{
+			m_strValue = L"Content";
+		}
+		void OLEDrawAspectType::set(const std::wstring& strValue)
+		{
+			if ((L"Content" == strValue) ||
+				(L"Icon" == strValue))
+			{
+				m_strValue = strValue;
+			}
+		}
+		unsigned char OLEDrawAspectType::GetBYTECode() const
+		{
+			if (L"Content" == m_strValue)
+				return 0;
+			if (L"Icon" == m_strValue)
+				return 1;
+			return 0;
+		}
+		void OLEDrawAspectType::SetBYTECode(const unsigned char& src)
+		{
+			switch (src)
+			{
+			case 0:
+				m_strValue = L"Content";
+				break;
+			case 1:
+				m_strValue = L"Icon";
+				break;
+			default:
+				break;
+			}
+		}
+
+		OLEType::OLEType()
+		{
+			m_strValue = L"Embed";
+		}
+		void OLEType::set(const std::wstring& strValue)
+		{
+			if ((L"Embed" == strValue) ||
+				(L"Link" == strValue))
+			{
+				m_strValue = strValue;
+			}
+		}
+		unsigned char OLEType::GetBYTECode() const
+		{
+			if (L"Embed" == m_strValue)
+				return 0;
+			if (L"Link" == m_strValue)
+				return 1;
+			return 0;
+		}
+		void OLEType::SetBYTECode(const unsigned char& src)
+		{
+			switch (src)
+			{
+			case 0:
+				m_strValue = L"Embed";
+				break;
+			case 1:
+				m_strValue = L"Link";
+				break;
+			default:
+				break;
+			}
+		}
+
+		OLEUpdateMode::OLEUpdateMode()
+		{
+			m_strValue = L"Always";
+		}
+		void OLEUpdateMode::set(const std::wstring& strValue)
+		{
+			if ((L"Always" == strValue) ||
+				(L"OnCall" == strValue))
+			{
+				m_strValue = strValue;
+			}
+		}
+		unsigned char OLEUpdateMode::GetBYTECode() const
+		{
+			if (L"Always" == m_strValue)
+				return 0;
+			if (L"OnCall" == m_strValue)
+				return 1;
+			return 0;
+		}
+		void OLEUpdateMode::SetBYTECode(const unsigned char& src)
+		{
+			switch (src)
+			{
+			case 0:
+				m_strValue = L"Always";
+				break;
+			case 1:
+				m_strValue = L"OnCall";
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
 	namespace Logic
 	{
 		void COLEObject::fromXML(XmlUtils::CXmlNode& node)
@@ -102,7 +210,6 @@ namespace PPTX
 				m_OleObjectFile->set_filename_cache	(ole_image);
 			}
 		}
-
 		std::wstring COLEObject::toXML() const
 		{
 			return L"";
@@ -344,7 +451,6 @@ namespace PPTX
 				pWriter->EndRecord();
 			}
 		}
-
 		void COLEObject::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
 			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
@@ -584,7 +690,6 @@ namespace PPTX
 		{
 			return m_sProgId.IsInit() && (m_sData.IsInit() || m_oId.IsInit() || m_OleObjectFile.IsInit());
 		}
-
 		smart_ptr<OOX::OleObject> COLEObject::GetOleObject(const OOX::RId& oRId, OOX::IFileContainer* pRels) const
 		{
 			smart_ptr<OOX::OleObject> ole_file = m_OleObjectFile;
@@ -622,6 +727,10 @@ namespace PPTX
 			}
 			return sRes;
 		}
+		OOX::EElementType COLEObject::getType () const
+		{
+			return OOX::et_pic;
+		}
 
 		Pic::Pic(std::wstring ns)
 		{
@@ -641,7 +750,10 @@ namespace PPTX
 			m_pLevelUp	= NULL;
 			fromXML(oReader);
 		}		
-		
+		OOX::EElementType Pic::getType () const
+		{
+			return OOX::et_pic;
+		}
 		const Pic& Pic::operator =(XmlUtils::CXmlNode& node)
 		{
 			fromXML(node);
@@ -677,7 +789,6 @@ namespace PPTX
 			}
 			FillParentPointersForChilds();
 		}
-
 		void Pic::fromXML(XmlUtils::CXmlNode& node)
 		{
 			m_namespace = XmlUtils::GetNamespace(node.GetName());
@@ -724,7 +835,6 @@ namespace PPTX
 			
 			FillParentPointersForChilds();
 		}
-
 		std::wstring Pic::toXML() const
 		{
 			XmlUtils::CAttribute oAttr;
@@ -738,7 +848,6 @@ namespace PPTX
 
 			return XmlUtils::CreateNode(m_namespace + L":pic", oAttr, oValue);
 		}
-		
 		void Pic::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
 			if(oleObject.IsInit())
@@ -864,7 +973,6 @@ namespace PPTX
 			}
 			pWriter->EndRecord();
 		}
-
 		void Pic::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 		{
 			std::wstring namespace_ = m_namespace;
@@ -955,8 +1063,6 @@ namespace PPTX
 				}
 			}
 		}
-
-
 		void Pic::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
 			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
@@ -1123,7 +1229,6 @@ namespace PPTX
 
 			pReader->Seek(_end_rec);
 		}
-
 		void Pic::FillLevelUp()
 		{
 			if ((m_pLevelUp == NULL) && (nvPicPr.nvPr.ph.IsInit()))
@@ -1145,7 +1250,6 @@ namespace PPTX
 				}
 			}
 		}
-
 		void Pic::Merge(Pic& pic, bool bIsSlidePlaceholder)
 		{
 			if (m_pLevelUp)
@@ -1163,7 +1267,6 @@ namespace PPTX
 				pic.style->SetParentFilePointer(parentFile);
 			}
 		}
-
 		void Pic::FillParentPointersForChilds()
 		{
 			nvPicPr.SetParentPointer(this);
@@ -1174,7 +1277,6 @@ namespace PPTX
 			if (oleObject.IsInit())
 				oleObject->SetParentPointer(this);
 		}
-
 		void Pic::GetRect(Aggplus::RECT& pRect)const
 		{
 			pRect.bottom	= 0;
@@ -1192,7 +1294,6 @@ namespace PPTX
 			if(parentIs<Logic::SpTree>())
 				parentAs<Logic::SpTree>().NormalizeRect(pRect);
 		}
-
 		std::wstring Pic::GetFullPicName()const
 		{
 			if (blipFill.blip.IsInit())
@@ -1235,7 +1336,6 @@ namespace PPTX
 			}
 			return file;
 		}
-
 		DWORD Pic::GetFill(UniFill& fill)const
 		{
 			DWORD BGRA = 0;
@@ -1257,7 +1357,6 @@ namespace PPTX
 				spPr.Fill.Merge(fill);
 			return BGRA;
 		}
-
 		DWORD Pic::GetLine(Ln& line)const
 		{
 			DWORD BGRA = 0;
@@ -1279,8 +1378,6 @@ namespace PPTX
 				spPr.ln->Merge(line);
 			return BGRA;
 		}
-
-		
 		double Pic::GetStTrim () const
 		{
 			double trim = 0.0;
@@ -1307,7 +1404,6 @@ namespace PPTX
 
 			return trim;
 		}
-
 		double Pic::GetEndTrim () const
 		{
 			double trim = -1.0;
@@ -1334,12 +1430,10 @@ namespace PPTX
 
 			return trim;
 		}
-
 		long Pic::GetRefId() const
 		{
 			return (long) nvPicPr.cNvPr.id;
 		}
-
 		void Pic::toXmlWriterVML(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, const WCHAR* pId, bool in_group)
 		{
 			bool bOle = oleObject.IsInit() && oleObject->isValid();
@@ -1606,5 +1700,11 @@ namespace PPTX
 			}
             XmlMacroReadAttributeBase(node, L"spid",	oleObject->m_sShapeId);
 		}
+		void Pic::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
+		{
+			WritingElement_ReadAttributes_Start(oReader)
+				WritingElement_ReadAttributes_Read_if(oReader, _T("macro"), macro)
+			WritingElement_ReadAttributes_End(oReader)
+		}
 	} // namespace Logic
 } // namespace PPTX
diff --git a/OOXML/PPTXFormat/Logic/Pic.h b/OOXML/PPTXFormat/Logic/Pic.h
index 8d664faebf..58860d63b6 100644
--- a/OOXML/PPTXFormat/Logic/Pic.h
+++ b/OOXML/PPTXFormat/Logic/Pic.h
@@ -45,137 +45,12 @@ namespace PPTX
 {
 	namespace Limit
 	{
-		class OLEDrawAspectType : public BaseLimit
-		{
-		public:
-			OLEDrawAspectType()
-			{
-				m_strValue = _T("Content");
-			}
+		DEFINE_LIMIT_BASE(OLEDrawAspectType)
 
-			_USE_STRING_OPERATOR
+		DEFINE_LIMIT_BASE(OLEType)
 
-			virtual void set(const std::wstring& strValue)
-			{
-				if ((_T("Content") == strValue) ||
-					(_T("Icon") == strValue))
-				{
-					m_strValue = strValue;
-				}
-			}
+		DEFINE_LIMIT_BASE(OLEUpdateMode)
 
-			virtual BYTE GetBYTECode() const
-			{
-				if (_T("Content") == m_strValue)
-					return 0;
-				if (_T("Icon") == m_strValue)
-					return 1;
-				return 0;
-			}
-
-			virtual void SetBYTECode(const BYTE& src)
-			{
-				switch (src)
-				{
-				case 0:
-					m_strValue = _T("Content");
-					break;
-				case 1:
-					m_strValue = _T("Icon");
-					break;
-				default:
-					break;
-				}
-			}
-		};
-
-		class OLEType : public BaseLimit
-		{
-		public:
-			OLEType()
-			{
-				m_strValue = _T("Embed");
-			}
-
-			_USE_STRING_OPERATOR
-
-			virtual void set(const std::wstring& strValue)
-			{
-				if ((_T("Embed") == strValue) ||
-					(_T("Link") == strValue))
-				{
-					m_strValue = strValue;
-				}
-			}
-
-			virtual BYTE GetBYTECode() const
-			{
-				if (_T("Embed") == m_strValue)
-					return 0;
-				if (_T("Link") == m_strValue)
-					return 1;
-				return 0;
-			}
-
-			virtual void SetBYTECode(const BYTE& src)
-			{
-				switch (src)
-				{
-				case 0:
-					m_strValue = _T("Embed");
-					break;
-				case 1:
-					m_strValue = _T("Link");
-					break;
-				default:
-					break;
-				}
-			}
-		};
-
-		class OLEUpdateMode : public BaseLimit
-		{
-		public:
-			OLEUpdateMode()
-			{
-				m_strValue = _T("Always");
-			}
-
-			_USE_STRING_OPERATOR
-
-			virtual void set(const std::wstring& strValue)
-			{
-				if ((_T("Always") == strValue) ||
-					(_T("OnCall") == strValue))
-				{
-					m_strValue = strValue;
-				}
-			}
-
-			virtual BYTE GetBYTECode() const
-			{
-				if (_T("Always") == m_strValue)
-					return 0;
-				if (_T("OnCall") == m_strValue)
-					return 1;
-				return 0;
-			}
-
-			virtual void SetBYTECode(const BYTE& src)
-			{
-				switch (src)
-				{
-				case 0:
-					m_strValue = _T("Always");
-					break;
-				case 1:
-					m_strValue = _T("OnCall");
-					break;
-				default:
-					break;
-				}
-			}
-		};
 	} // namespace Limit
 } // namespace PPTX
 
@@ -187,10 +62,7 @@ namespace PPTX
 		class COLEObject : public WrapperWritingElement
 		{
 		public:
-			virtual OOX::EElementType getType () const
-			{
-				return OOX::et_pic;
-			}
+			virtual OOX::EElementType getType () const;
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual std::wstring toXML() const;
 			
@@ -235,10 +107,7 @@ namespace PPTX
 			Pic(std::wstring ns = L"p");
 			virtual ~Pic();
 
-			virtual OOX::EElementType getType () const
-			{
-				return OOX::et_pic;
-			}
+			virtual OOX::EElementType getType () const;
 
 			explicit Pic(XmlUtils::CXmlNode& node);
 			const Pic& operator =(XmlUtils::CXmlNode& node);
@@ -274,12 +143,7 @@ namespace PPTX
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
 			void toXmlWriterVML(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, const WCHAR* pId = NULL, bool in_group = false);
 			
-			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
-			{
-				WritingElement_ReadAttributes_Start(oReader)
-					WritingElement_ReadAttributes_Read_if(oReader, _T("macro"), macro)
-				WritingElement_ReadAttributes_End(oReader)
-			}
+			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
 //----------------------------------------------------------------------
 			Shape*					m_pLevelUp;
 			NvPicPr					nvPicPr;
@@ -292,6 +156,7 @@ namespace PPTX
 
 			std::wstring			m_namespace;
 			nullable_string			m_sClientDataXml;
+
 		protected:
 			virtual void FillParentPointersForChilds();
 		};
diff --git a/OOXML/PPTXFormat/Logic/UniEffect.cpp b/OOXML/PPTXFormat/Logic/UniEffect.cpp
index 38ea926afd..8ad7fa3d81 100644
--- a/OOXML/PPTXFormat/Logic/UniEffect.cpp
+++ b/OOXML/PPTXFormat/Logic/UniEffect.cpp
@@ -71,7 +71,6 @@ namespace PPTX
 		{
 			Effect.reset();
 		}
-
 		UniEffect::~UniEffect()
 		{
 		}
@@ -136,6 +135,37 @@ namespace PPTX
 			fromXML(node);
 		}
 
+		OOX::EElementType UniEffect::getType () const
+		{
+			if (Effect.is_init())
+				return Effect->getType();
+			else return OOX::et_Unknown;
+		}
+
+		std::wstring UniEffect::toXML() const
+		{
+			if (Effect.IsInit())
+				return Effect->toXML();
+			return _T("");
+		}
+		void UniEffect::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
+		{
+			if (Effect.is_init())
+				Effect->toXmlWriter(pWriter);
+		}
+		void UniEffect::InitPointer(WrapperWritingElement* pElem)
+		{
+			Effect = pElem;
+		}
+		void UniEffect::SetParentPointer(const WrapperWritingElement* pParent)
+		{
+			if(is_init())
+				Effect->SetParentPointer(pParent);
+		}
+		void UniEffect::FillParentPointersForChilds()
+		{
+		}
+
 		const UniEffect& UniEffect::operator =(XmlUtils::CXmlNode& node)
 		{
 			fromXML(node);
@@ -421,4 +451,4 @@ namespace PPTX
 		}
 
 	} // namespace Logic
-} // namespace PPTX
\ No newline at end of file
+} // namespace PPTX
diff --git a/OOXML/PPTXFormat/Logic/UniEffect.h b/OOXML/PPTXFormat/Logic/UniEffect.h
index a3c386f135..8858fee422 100644
--- a/OOXML/PPTXFormat/Logic/UniEffect.h
+++ b/OOXML/PPTXFormat/Logic/UniEffect.h
@@ -47,12 +47,7 @@ namespace PPTX
 			explicit UniEffect(XmlUtils::CXmlNode& node);
 			const UniEffect& operator =(XmlUtils::CXmlNode& node);
 
-			virtual OOX::EElementType getType () const
-			{
-				if (Effect.is_init())
-					return Effect->getType();
-				else return OOX::et_Unknown;
-			}
+			virtual OOX::EElementType getType () const;
 			
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
 			virtual void fromXML(XmlUtils::CXmlNode& node);
@@ -63,36 +58,21 @@ namespace PPTX
 			template<class T> T& as() {return Effect.as<T>();}
 			template<class T> const T& as() const {return static_cast<const T&>(*Effect);}
 
-			virtual std::wstring toXML() const
-			{
-				if (Effect.IsInit())
-					return Effect->toXML();
-				return _T("");
-			}
-			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
-			{
-				if (Effect.is_init())
-					Effect->toXmlWriter(pWriter);
-			}		
+			virtual std::wstring toXML() const;
+			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
 			
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const ;
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
 
-			void InitPointer(WrapperWritingElement* pElem)
-			{
-				Effect = pElem;
-			}
-			virtual void SetParentPointer(const WrapperWritingElement* pParent)
-			{
-				if(is_init())
-					Effect->SetParentPointer(pParent);
-			};
-			smart_ptr<WrapperWritingElement> Effect;
-		protected:
-			virtual void FillParentPointersForChilds(){};
+			void InitPointer(WrapperWritingElement* pElem);
+			virtual void SetParentPointer(const WrapperWritingElement* pParent);
 
+			smart_ptr<WrapperWritingElement> Effect;
+
+		protected:
+			virtual void FillParentPointersForChilds();
 		};
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_UNIEFFECT_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_UNIEFFECT_INCLUDE_H
diff --git a/OOXML/PPTXFormat/WrapperWritingElement.cpp b/OOXML/PPTXFormat/WrapperWritingElement.cpp
new file mode 100644
index 0000000000..a17102a87f
--- /dev/null
+++ b/OOXML/PPTXFormat/WrapperWritingElement.cpp
@@ -0,0 +1,87 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "WrapperWritingElement.h"
+
+namespace PPTX
+{
+	WrapperWritingElement::WrapperWritingElement(OOX::Document *pMain) :  OOX::WritingElement(pMain), parentElement(NULL), parentFile(NULL)
+	{
+	}
+	WrapperWritingElement::~WrapperWritingElement()
+	{
+	}
+	void WrapperWritingElement::FillParentPointersForChilds()
+	{
+	}
+	void WrapperWritingElement::SetParentPointer(const WrapperWritingElement* pParent)
+	{
+		parentElement	= pParent;
+		parentFile		= parentElement->parentFile;
+
+		FillParentPointersForChilds();
+	}
+	void WrapperWritingElement::SetParentFilePointer(const WrapperFile* pFile)
+	{
+		parentFile = pFile;
+		FillParentPointersForChilds();
+	}
+	WrapperWritingElement const* const	WrapperWritingElement::GetParentPointer() const
+	{
+		return parentElement;
+	}
+	WrapperFile const* const WrapperWritingElement::GetParentFilePointer() const
+	{
+		return parentFile;
+	}
+	void WrapperWritingElement::fromXMLString(std::wstring strXml)
+	{
+		XmlUtils::CXmlNode oNode;
+		oNode.FromXmlString(strXml);
+		fromXML(oNode);
+	}
+	OOX::EElementType WrapperWritingElement::getType() const
+	{
+		return OOX::et_Unknown;
+	}
+
+	void WrapperWritingElement::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
+	{
+	}
+	std::wstring WrapperWritingElement::toXML() const
+	{
+		NSBinPptxRW::CXmlWriter oWriter;
+		toXmlWriter(&oWriter);
+
+		return oWriter.GetXmlString();
+	}
+} // namespace PPTX
diff --git a/OOXML/PPTXFormat/WrapperWritingElement.h b/OOXML/PPTXFormat/WrapperWritingElement.h
index 9d2cc6a042..2ca2b5588b 100644
--- a/OOXML/PPTXFormat/WrapperWritingElement.h
+++ b/OOXML/PPTXFormat/WrapperWritingElement.h
@@ -64,77 +64,51 @@ namespace PPTX
 	class WrapperWritingElement : public OOX::WritingElement
 	{
 	public:
-		WrapperWritingElement(OOX::Document *pMain = NULL) :  OOX::WritingElement(pMain), parentElement(NULL), parentFile(NULL)
-		{
-		}
-		virtual ~WrapperWritingElement()
-		{
-		}
+		WrapperWritingElement(OOX::Document *pMain = NULL);
+		virtual ~WrapperWritingElement();
+
 	protected:
 		WrapperWritingElement const* parentElement;
 		WrapperFile const* parentFile;
 
-		virtual void FillParentPointersForChilds(){}
+		virtual void FillParentPointersForChilds();
+
 	public:
-        virtual void
-        SetParentPointer(const WrapperWritingElement* pParent)
-		{
-			parentElement	= pParent;
-			parentFile		= parentElement->parentFile;
+		virtual void SetParentPointer(const WrapperWritingElement* pParent);
+		virtual void SetParentFilePointer(const WrapperFile* pFile);
 
-			FillParentPointersForChilds();
-		}
-		virtual void SetParentFilePointer(const WrapperFile* pFile)
-		{
-			parentFile = pFile;
-			FillParentPointersForChilds();
-		}
-		virtual WrapperWritingElement const* const	GetParentPointer()const		{return parentElement;}
-		virtual WrapperFile const* const			GetParentFilePointer()const {return parentFile;}
+		virtual WrapperWritingElement const* const	GetParentPointer() const;
+		virtual WrapperFile const* const			GetParentFilePointer() const;
 
-		virtual void fromXMLString(std::wstring strXml)
-		{
-			XmlUtils::CXmlNode oNode;
-			oNode.FromXmlString(strXml);
-			fromXML(oNode);
-		}
-		virtual OOX::EElementType getType() const
-		{
-			return OOX::et_Unknown;
-		}
-		template<class T> const bool parentIs()const
+		virtual void fromXMLString(std::wstring strXml);
+		virtual OOX::EElementType getType() const;
+
+		template<class T> const bool parentIs() const
 		{
 			if (NULL == parentElement)
 				return false;
 			T* pResult = dynamic_cast<T*>(const_cast<PPTX::WrapperWritingElement*>(parentElement));
 			return (NULL != pResult);
 		}
-		template<class T> const T& parentAs()const
+		template<class T> const T& parentAs() const
 		{
 			T* pResult = dynamic_cast<T*>(const_cast<PPTX::WrapperWritingElement*>(parentElement));
 			return *pResult;
 		}
-		template<class T> const bool parentFileIs()const
+		template<class T> const bool parentFileIs() const
 		{
 			if (NULL == parentFile)
 				return false;
 			T* pResult = dynamic_cast<T*>(const_cast<PPTX::WrapperFile*>(parentFile));
 			return (NULL != pResult);
 		}
-		template<class T> T& parentFileAs()const
+		template<class T> T& parentFileAs() const
 		{
 			T* pResult = dynamic_cast<T*>(const_cast<PPTX::WrapperFile*>(parentFile));
 			return *pResult;
 		}
-		virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
-		{
-		}
-		virtual std::wstring toXML() const
-		{
-			NSBinPptxRW::CXmlWriter oWriter;
-			toXmlWriter(&oWriter);
 
-			return oWriter.GetXmlString();
-		}
+		virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
+		virtual std::wstring toXML() const;
 	};
 } // namespace PPTX
diff --git a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
index 1ce73e3036..b1e0cbaa7c 100644
--- a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
+++ b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
@@ -19,6 +19,9 @@ include(../../../../Common/base.pri)
 #BOOST
 include($$PWD/../../../../Common/3dParty/boost/boost.pri)
 
+#LIMITS
+include($$PWD/../../../PPTXFormat/Limit/pro/pptx_limits.pri)
+
 DEFINES += UNICODE \
     _UNICODE \
     AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
@@ -308,6 +311,7 @@ SOURCES += \
 	../../../PPTXFormat/HandoutMaster.cpp \
 	../../../PPTXFormat/Core.cpp \
 	../../../PPTXFormat/App.cpp \
+	../../../PPTXFormat/WrapperWritingElement.cpp \
 	../../../PPTXFormat/Comments.cpp \
 	../../../PPTXFormat/CommentAuthors.cpp
 }
@@ -315,6 +319,7 @@ SOURCES += \
 SOURCES += \
 	pptx_format.cpp \
 	../../../../OOXML/Binary/Document/BinWriter/BinEquationWriter.cpp \
+	\
 	../../../../MsBinaryFile/Common/Vml/BaseShape.cpp \
 	../../../../MsBinaryFile/Common/Vml/toVmlConvert.cpp \
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PptFormula.cpp \
@@ -378,97 +383,7 @@ SOURCES += \
 	../../../PPTXFormat/Presentation/EmbeddedFontDataId.cpp \
 	../../../PPTXFormat/Presentation/Kinsoku.cpp \
 	../../../PPTXFormat/Presentation/SectionLst.cpp \
-	../../../PPTXFormat/Presentation/SldSz.cpp \
-	\
-	../../../PPTXFormat/Limit/AlbumLayout.cpp \
-	../../../PPTXFormat/Limit/AnimationDgmBuild.cpp \
-	../../../PPTXFormat/Limit/BaseLimit.cpp \
-	../../../PPTXFormat/Limit/BevelType.cpp \
-	../../../PPTXFormat/Limit/BlendMode.cpp \
-	../../../PPTXFormat/Limit/BlipCompression.cpp \
-	../../../PPTXFormat/Limit/BWMode.cpp \
-	../../../PPTXFormat/Limit/CameraType.cpp \
-	../../../PPTXFormat/Limit/ChartBuild.cpp \
-	../../../PPTXFormat/Limit/ChartBuildType.cpp \
-	../../../PPTXFormat/Limit/ColorSchemeIndex.cpp \
-	../../../PPTXFormat/Limit/CompoundLine.cpp \
-	../../../PPTXFormat/Limit/Conformance.cpp \
-	../../../PPTXFormat/Limit/ContentStatus.cpp \
-	../../../PPTXFormat/Limit/CornerDirectionVal.cpp \
-	../../../PPTXFormat/Limit/DgmBuild.cpp \
-	../../../PPTXFormat/Limit/DgmBuildType.cpp \
-	../../../PPTXFormat/Limit/EffectContainerType.cpp \
-	../../../PPTXFormat/Limit/EightDirectionVal.cpp \
-	../../../PPTXFormat/Limit/FillPath.cpp \
-	../../../PPTXFormat/Limit/Flip.cpp \
-	../../../PPTXFormat/Limit/FontAlign.cpp \
-	../../../PPTXFormat/Limit/FontStyleIndex.cpp \
-	../../../PPTXFormat/Limit/FrameShape.cpp \
-	../../../PPTXFormat/Limit/HorzOverflow.cpp \
-	../../../PPTXFormat/Limit/InOutDirectionVal.cpp \
-	../../../PPTXFormat/Limit/IterateType.cpp \
-	../../../PPTXFormat/Limit/LastView.cpp \
-	../../../PPTXFormat/Limit/LightRigType.cpp \
-	../../../PPTXFormat/Limit/LineCap.cpp \
-	../../../PPTXFormat/Limit/LineEndSize.cpp \
-	../../../PPTXFormat/Limit/LineEndType.cpp \
-	../../../PPTXFormat/Limit/Material.cpp \
-	../../../PPTXFormat/Limit/OnOff.cpp \
-	../../../PPTXFormat/Limit/Orient.cpp \
-	../../../PPTXFormat/Limit/ParaBuildType.cpp \
-	../../../PPTXFormat/Limit/PathFillMode.cpp \
-	../../../PPTXFormat/Limit/PattFillVal.cpp \
-	../../../PPTXFormat/Limit/PenAlign.cpp \
-	../../../PPTXFormat/Limit/PlaceholderSize.cpp \
-	../../../PPTXFormat/Limit/PlaceholderType.cpp \
-	../../../PPTXFormat/Limit/PresetShadowVal.cpp \
-	../../../PPTXFormat/Limit/PrstClrVal.cpp \
-	../../../PPTXFormat/Limit/PrstDashVal.cpp \
-	../../../PPTXFormat/Limit/RectAlign.cpp \
-	../../../PPTXFormat/Limit/SchemeClrVal.cpp \
-	../../../PPTXFormat/Limit/ShapeType.cpp \
-	../../../PPTXFormat/Limit/SideDirectionVal.cpp \
-	../../../PPTXFormat/Limit/SlideLayoutType.cpp \
-	../../../PPTXFormat/Limit/SlideSize.cpp \
-	../../../PPTXFormat/Limit/SplitterBarState.cpp \
-	../../../PPTXFormat/Limit/SysClrVal.cpp \
-	../../../PPTXFormat/Limit/TextAlign.cpp \
-	../../../PPTXFormat/Limit/TextAnchor.cpp \
-	../../../PPTXFormat/Limit/TextAutonumberScheme.cpp \
-	../../../PPTXFormat/Limit/TextCaps.cpp \
-	../../../PPTXFormat/Limit/TextShapeType.cpp \
-	../../../PPTXFormat/Limit/TextStrike.cpp \
-	../../../PPTXFormat/Limit/TextTabAlignType.cpp \
-	../../../PPTXFormat/Limit/TextUnderline.cpp \
-	../../../PPTXFormat/Limit/TextVerticalType.cpp \
-	../../../PPTXFormat/Limit/TextWrap.cpp \
-	../../../PPTXFormat/Limit/TLAccumulate.cpp \
-	../../../PPTXFormat/Limit/TLAdditive.cpp \
-	../../../PPTXFormat/Limit/TLCalcMode.cpp \
-	../../../PPTXFormat/Limit/TLChartSubElement.cpp \
-	../../../PPTXFormat/Limit/TLColorDirection.cpp \
-	../../../PPTXFormat/Limit/TLColorSpace.cpp \
-	../../../PPTXFormat/Limit/TLCommandType.cpp \
-	../../../PPTXFormat/Limit/TLMasterRelation.cpp \
-	../../../PPTXFormat/Limit/TLNextAc.cpp \
-	../../../PPTXFormat/Limit/TLNodeFillType.cpp \
-	../../../PPTXFormat/Limit/TLNodeType.cpp \
-	../../../PPTXFormat/Limit/TLOrigin.cpp \
-	../../../PPTXFormat/Limit/TLOverride.cpp \
-	../../../PPTXFormat/Limit/TLPathEditMode.cpp \
-	../../../PPTXFormat/Limit/TLPresetClass.cpp \
-	../../../PPTXFormat/Limit/TLPrevAc.cpp \
-	../../../PPTXFormat/Limit/TLRestart.cpp \
-	../../../PPTXFormat/Limit/TLRuntimeTrigger.cpp \
-	../../../PPTXFormat/Limit/TLSyncBehavior.cpp \
-	../../../PPTXFormat/Limit/TLTransform.cpp \
-	../../../PPTXFormat/Limit/TLTransition.cpp \
-	../../../PPTXFormat/Limit/TLTriggerEvent.cpp \
-	../../../PPTXFormat/Limit/TLValueType.cpp \
-	../../../PPTXFormat/Limit/TransitionSpeed.cpp \
-	../../../PPTXFormat/Limit/VariantType.cpp \
-	../../../PPTXFormat/Limit/VertOverflow.cpp
-
+	../../../PPTXFormat/Presentation/SldSz.cpp
 
 HEADERS += \
 	pptx_format.h \
@@ -476,95 +391,7 @@ HEADERS += \
 	../../../PPTXFormat/DrawingConverter/ASCOfficePPTXFile.h \
 	../../../PPTXFormat/FileTypes.h \
 	../../../PPTXFormat/Namespaces.h \
-	../../../PPTXFormat/WritingVector.h \
-	../../../PPTXFormat/Limit/AlbumLayout.h \
-	../../../PPTXFormat/Limit/AnimationDgmBuild.h \
-	../../../PPTXFormat/Limit/BaseLimit.h \
-	../../../PPTXFormat/Limit/BevelType.h \
-	../../../PPTXFormat/Limit/BlendMode.h \
-	../../../PPTXFormat/Limit/BlipCompression.h \
-	../../../PPTXFormat/Limit/BWMode.h \
-	../../../PPTXFormat/Limit/CameraType.h \
-	../../../PPTXFormat/Limit/ChartBuild.h \
-	../../../PPTXFormat/Limit/ChartBuildType.h \
-	../../../PPTXFormat/Limit/ColorSchemeIndex.h \
-	../../../PPTXFormat/Limit/CompoundLine.h \
-	../../../PPTXFormat/Limit/Conformance.h \
-	../../../PPTXFormat/Limit/ContentStatus.h \
-	../../../PPTXFormat/Limit/CornerDirectionVal.h \
-	../../../PPTXFormat/Limit/DgmBuild.h \
-	../../../PPTXFormat/Limit/DgmBuildType.h \
-	../../../PPTXFormat/Limit/EffectContainerType.h \
-	../../../PPTXFormat/Limit/EightDirectionVal.h \
-	../../../PPTXFormat/Limit/FillPath.h \
-	../../../PPTXFormat/Limit/Flip.h \
-	../../../PPTXFormat/Limit/FontAlign.h \
-	../../../PPTXFormat/Limit/FontStyleIndex.h \
-	../../../PPTXFormat/Limit/FrameShape.h \
-	../../../PPTXFormat/Limit/HorzOverflow.h \
-	../../../PPTXFormat/Limit/InOutDirectionVal.h \
-	../../../PPTXFormat/Limit/IterateType.h \
-	../../../PPTXFormat/Limit/LastView.h \
-	../../../PPTXFormat/Limit/LightRigType.h \
-	../../../PPTXFormat/Limit/LineCap.h \
-	../../../PPTXFormat/Limit/LineEndSize.h \
-	../../../PPTXFormat/Limit/LineEndType.h \
-	../../../PPTXFormat/Limit/Material.h \
-	../../../PPTXFormat/Limit/OnOff.h \
-	../../../PPTXFormat/Limit/Orient.h \
-	../../../PPTXFormat/Limit/ParaBuildType.h \
-	../../../PPTXFormat/Limit/PathFillMode.h \
-	../../../PPTXFormat/Limit/PattFillVal.h \
-	../../../PPTXFormat/Limit/PenAlign.h \
-	../../../PPTXFormat/Limit/PlaceholderSize.h \
-	../../../PPTXFormat/Limit/PlaceholderType.h \
-	../../../PPTXFormat/Limit/PresetShadowVal.h \
-	../../../PPTXFormat/Limit/PrstClrVal.h \
-	../../../PPTXFormat/Limit/PrstDashVal.h \
-	../../../PPTXFormat/Limit/RectAlign.h \
-	../../../PPTXFormat/Limit/SchemeClrVal.h \
-	../../../PPTXFormat/Limit/ShapeType.h \
-	../../../PPTXFormat/Limit/SideDirectionVal.h \
-	../../../PPTXFormat/Limit/SlideLayoutType.h \
-	../../../PPTXFormat/Limit/SlideSize.h \
-	../../../PPTXFormat/Limit/SplitterBarState.h \
-	../../../PPTXFormat/Limit/SysClrVal.h \
-	../../../PPTXFormat/Limit/TextAlign.h \
-	../../../PPTXFormat/Limit/TextAnchor.h \
-	../../../PPTXFormat/Limit/TextAutonumberScheme.h \
-	../../../PPTXFormat/Limit/TextCaps.h \
-	../../../PPTXFormat/Limit/TextShapeType.h \
-	../../../PPTXFormat/Limit/TextStrike.h \
-	../../../PPTXFormat/Limit/TextTabAlignType.h \
-	../../../PPTXFormat/Limit/TextUnderline.h \
-	../../../PPTXFormat/Limit/TextVerticalType.h \
-	../../../PPTXFormat/Limit/TextWrap.h \
-	../../../PPTXFormat/Limit/TLAccumulate.h \
-	../../../PPTXFormat/Limit/TLAdditive.h \
-	../../../PPTXFormat/Limit/TLCalcMode.h \
-	../../../PPTXFormat/Limit/TLChartSubElement.h \
-	../../../PPTXFormat/Limit/TLColorDirection.h \
-	../../../PPTXFormat/Limit/TLColorSpace.h \
-	../../../PPTXFormat/Limit/TLCommandType.h \
-	../../../PPTXFormat/Limit/TLMasterRelation.h \
-	../../../PPTXFormat/Limit/TLNextAc.h \
-	../../../PPTXFormat/Limit/TLNodeFillType.h \
-	../../../PPTXFormat/Limit/TLNodeType.h \
-	../../../PPTXFormat/Limit/TLOrigin.h \
-	../../../PPTXFormat/Limit/TLOverride.h \
-	../../../PPTXFormat/Limit/TLPathEditMode.h \
-	../../../PPTXFormat/Limit/TLPresetClass.h \
-	../../../PPTXFormat/Limit/TLPrevAc.h \
-	../../../PPTXFormat/Limit/TLRestart.h \
-	../../../PPTXFormat/Limit/TLRuntimeTrigger.h \
-	../../../PPTXFormat/Limit/TLSyncBehavior.h \
-	../../../PPTXFormat/Limit/TLTransform.h \
-	../../../PPTXFormat/Limit/TLTransition.h \
-	../../../PPTXFormat/Limit/TLTriggerEvent.h \
-	../../../PPTXFormat/Limit/TLValueType.h \
-	../../../PPTXFormat/Limit/TransitionSpeed.h \
-	../../../PPTXFormat/Limit/VariantType.h \
-	../../../PPTXFormat/Limit/VertOverflow.h \
+	\
 	../../../PPTXFormat/Logic/Bullets/BuAutoNum.h \
 	../../../PPTXFormat/Logic/Bullets/BuBlip.h \
 	../../../PPTXFormat/Logic/Bullets/BuChar.h \
@@ -579,12 +406,14 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Bullets/BuSzPct.h \
 	../../../PPTXFormat/Logic/Bullets/BuSzPts.h \
 	../../../PPTXFormat/Logic/Bullets/BuSzTx.h \
+	\
 	../../../PPTXFormat/Logic/Colors/ColorBase.h \
 	../../../PPTXFormat/Logic/Colors/ColorModifier.h \
 	../../../PPTXFormat/Logic/Colors/PrstClr.h \
 	../../../PPTXFormat/Logic/Colors/SchemeClr.h \
 	../../../PPTXFormat/Logic/Colors/SrgbClr.h \
 	../../../PPTXFormat/Logic/Colors/SysClr.h \
+	\
 	../../../PPTXFormat/Logic/Effects/AlphaBiLevel.h \
 	../../../PPTXFormat/Logic/Effects/AlphaCeiling.h \
 	../../../PPTXFormat/Logic/Effects/AlphaFloor.h \
@@ -614,6 +443,7 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Effects/SoftEdge.h \
 	../../../PPTXFormat/Logic/Effects/TintEffect.h \
 	../../../PPTXFormat/Logic/Effects/XfrmEffect.h \
+	\
 	../../../PPTXFormat/Logic/Fills/Blip.h \
 	../../../PPTXFormat/Logic/Fills/BlipFill.h \
 	../../../PPTXFormat/Logic/Fills/GradFill.h \
@@ -622,9 +452,11 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Fills/SolidFill.h \
 	../../../PPTXFormat/Logic/Fills/Stretch.h \
 	../../../PPTXFormat/Logic/Fills/Tile.h \
+	\
 	../../../PPTXFormat/Logic/Media/AudioCD.h \
 	../../../PPTXFormat/Logic/Media/MediaFile.h \
 	../../../PPTXFormat/Logic/Media/WavAudioFile.h \
+	\
 	../../../PPTXFormat/Logic/Path2D/ArcTo.h \
 	../../../PPTXFormat/Logic/Path2D/Close.h \
 	../../../PPTXFormat/Logic/Path2D/CubicBezTo.h \
@@ -632,17 +464,20 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Path2D/MoveTo.h \
 	../../../PPTXFormat/Logic/Path2D/PathBase.h \
 	../../../PPTXFormat/Logic/Path2D/QuadBezTo.h \
+	\
 	../../../PPTXFormat/Logic/Runs/Br.h \
 	../../../PPTXFormat/Logic/Runs/Fld.h \
 	../../../PPTXFormat/Logic/Runs/MathParaWrapper.h \
 	../../../PPTXFormat/Logic/Runs/Run.h \
 	../../../PPTXFormat/Logic/Runs/RunBase.h \
+	\
 	../../../PPTXFormat/Logic/Table/Table.h \
 	../../../PPTXFormat/Logic/Table/TableCell.h \
 	../../../PPTXFormat/Logic/Table/TableCellProperties.h \
 	../../../PPTXFormat/Logic/Table/TableCol.h \
 	../../../PPTXFormat/Logic/Table/TableProperties.h \
 	../../../PPTXFormat/Logic/Table/TableRow.h \
+	\
 	../../../PPTXFormat/Logic/Timing/Anim.h \
 	../../../PPTXFormat/Logic/Timing/AnimClr.h \
 	../../../PPTXFormat/Logic/Timing/AnimEffect.h \
@@ -683,6 +518,7 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Timing/TnLst.h \
 	../../../PPTXFormat/Logic/Timing/TxEl.h \
 	../../../PPTXFormat/Logic/Timing/Video.h \
+	\
 	../../../PPTXFormat/Logic/Transitions/CornerDirectionTransition.h \
 	../../../PPTXFormat/Logic/Transitions/EightDirectionTransition.h \
 	../../../PPTXFormat/Logic/Transitions/EmptyTransition.h \
@@ -696,6 +532,7 @@ HEADERS += \
 	../../../PPTXFormat/Logic/Transitions/TransitionBase.h \
 	../../../PPTXFormat/Logic/Transitions/WheelTransition.h \
 	../../../PPTXFormat/Logic/Transitions/ZoomTransition.h \
+	\
 	../../../PPTXFormat/Logic/Controls.h \
 	../../../PPTXFormat/Logic/Ah.h \
 	../../../PPTXFormat/Logic/AhBase.h \
@@ -793,17 +630,20 @@ HEADERS += \
 	../../../PPTXFormat/Logic/UniPath2D.h \
 	../../../PPTXFormat/Logic/Xfrm.h \
 	../../../PPTXFormat/Logic/XmlId.h \
+	\
 	../../../PPTXFormat/Presentation/EmbeddedFont.h \
 	../../../PPTXFormat/Presentation/EmbeddedFontDataId.h \
 	../../../PPTXFormat/Presentation/Kinsoku.h \
 	../../../PPTXFormat/Presentation/NotesSz.h \
 	../../../PPTXFormat/Presentation/PhotoAlbum.h \
 	../../../PPTXFormat/Presentation/SldSz.h \
+	\
 	../../../PPTXFormat/Theme/ClrScheme.h \
 	../../../PPTXFormat/Theme/ExtraClrScheme.h \
 	../../../PPTXFormat/Theme/FmtScheme.h \
 	../../../PPTXFormat/Theme/FontScheme.h \
 	../../../PPTXFormat/Theme/ThemeElements.h \
+	\
 	../../../PPTXFormat/ViewProps/CSldViewPr.h \
 	../../../PPTXFormat/ViewProps/CViewPr.h \
 	../../../PPTXFormat/ViewProps/GridSpacing.h \
@@ -819,6 +659,7 @@ HEADERS += \
 	../../../PPTXFormat/ViewProps/Sld.h \
 	../../../PPTXFormat/ViewProps/SlideViewPr.h \
 	../../../PPTXFormat/ViewProps/SorterViewPr.h \
+	\
 	../../../PPTXFormat/App.h \
 	../../../PPTXFormat/CommentAuthors.h \
 	../../../PPTXFormat/Comments.h \
@@ -843,6 +684,7 @@ HEADERS += \
 	../../../PPTXFormat/ViewProps.h \
 	../../../PPTXFormat/WrapperFile.h \
 	../../../PPTXFormat/WrapperWritingElement.h \
+	\
 	../../../Binary/Presentation/BinaryFileReaderWriter.h \
 	../../../Binary/Presentation/BinReaderWriterDefines.h \
 	../../../Binary/Presentation/BinWriters.h \
@@ -855,9 +697,11 @@ HEADERS += \
 	../../../Binary/Presentation/WMFToImageConverter.h \
 	../../../Binary/Presentation/DefaultNotesMaster.h \
 	../../../Binary/Presentation/DefaultNotesTheme.h \
+	\
 	../../../Base/Nullable.h \
 	../../../../HtmlRenderer/include/ASCSVGWriter.h \
 	../../../../Common/FileDownloader/FileDownloader.h \
+	\
 	../../../PPTXFormat/ShowPr/Browse.h \
 	../../../PPTXFormat/ShowPr/CustShow.h \
 	../../../PPTXFormat/ShowPr/Kiosk.h \
@@ -865,6 +709,7 @@ HEADERS += \
 	../../../PPTXFormat/ShowPr/ShowPr.h \
 	../../../PPTXFormat/ShowPr/SldAll.h \
 	../../../PPTXFormat/ShowPr/SldRg.h \
+	\
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h \
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h \
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h \
diff --git a/OOXML/Projects/Linux/PPTXFormatLib/pptx_format_logic.cpp b/OOXML/Projects/Linux/PPTXFormatLib/pptx_format_logic.cpp
index a5d2191b1a..f402e7169d 100644
--- a/OOXML/Projects/Linux/PPTXFormatLib/pptx_format_logic.cpp
+++ b/OOXML/Projects/Linux/PPTXFormatLib/pptx_format_logic.cpp
@@ -270,7 +270,6 @@
 #include "../../../PPTXFormat/Logic/Effects/TintEffect.cpp"
 #include "../../../PPTXFormat/Logic/Effects/XfrmEffect.cpp"
 
-
 #include "../../../PPTXFormat/Presentation.cpp"
 #include "../../../PPTXFormat/FileContainer.cpp"
 #include "../../../PPTXFormat/FileTypes.cpp"
@@ -292,5 +291,6 @@
 #include "../../../PPTXFormat/HandoutMaster.cpp"
 #include "../../../PPTXFormat/Core.cpp"
 #include "../../../PPTXFormat/App.cpp"
+#include "../../../PPTXFormat/WrapperWritingElement.cpp"
 #include "../../../PPTXFormat/Comments.cpp"
 #include "../../../PPTXFormat/CommentAuthors.cpp"