o:allowincell -> layoutInCell

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -2989,6 +2989,17 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
 		*/
 	}
 
+    nullable_bool isAllowInCell;
+    nullable_string sAllowInCell;
+    oNode.ReadAttributeBase(L"o:allowincell", sAllowInCell);
+    if (sAllowInCell.is_init())
+    {
+        if ((L"f" == *sAllowInCell) || (L"false"== *sAllowInCell))
+            isAllowInCell = false;
+        if ((L"t" == *sAllowInCell) || (L"true"== *sAllowInCell))
+            isAllowInCell = true;
+    }
+
 	CString strWrapPoints = oNode.GetAttribute(_T("wrapcoords"));
 	CString strWrapPointsResult = _T("");
 	if (_T("") != strWrapPoints)
@@ -3029,6 +3040,14 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
 		}
 	}
 
+    if (isAllowInCell.is_init())
+    {
+        if (*isAllowInCell)
+            oWriter.WriteAttribute(_T("layoutInCell"), (CString)_T("1"));
+        else
+            oWriter.WriteAttribute(_T("layoutInCell"), (CString)_T("0"));
+    }
+
 	oWriter.EndAttributes();
 
 	oWriter.StartNode(_T("wp:positionH"));

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h

@@ -36,6 +36,13 @@
 #include "../../../Attributes.h"
 #include "Formula.h"
 
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
+
 namespace NSCustomVML
 {
 	using namespace NSPresentationEditor;