DocFormat - fix word95 table

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -1353,6 +1353,7 @@ namespace DocFileFormat
 						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
 					}break;
 
+					case sprmOldPFInTable:
 					case sprmPItap:
 					{
 						iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -354,7 +354,7 @@ namespace DocFileFormat
 
 		int nComputedCellWidthsGrid = 0;
 
-		for (size_t ccc = 0; ccc <= _gridIndex; ccc++)
+		for (size_t ccc = 0; ccc < _grid->size() && ccc <= _gridIndex; ccc++)
 		{
 			nComputedCellWidthsGrid += _grid->at(ccc);
 		}

ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.cpp

@@ -81,7 +81,7 @@ namespace PPTX
 		}
 		std::wstring EffectLst::toXML() const
 		{
-			std::wstring str = _T("<a:effectLst>");
+			std::wstring str;
 			if (blur.IsInit())			str += blur->toXML();
 			if (fillOverlay.IsInit())	str += fillOverlay->toXML();
 			if (glow.IsInit())			str += glow->toXML();
@@ -91,11 +91,20 @@ namespace PPTX
 			if (reflection.IsInit())	str += reflection->toXML();
 			if (softEdge.IsInit())		str += softEdge->toXML();
 
-			str += _T("</a:effectLst>");
+			if (false == str.empty())
+			{
+				str += L"<a:effectLst>" + str + L"</a:effectLst>";
+			}
 			return str;
 		}
 		void EffectLst::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 		{
+			if (!blur.IsInit() && !fillOverlay.IsInit() && !glow.IsInit() && !innerShdw.IsInit() && 
+				!outerShdw.IsInit() && !prstShdw.IsInit() && !reflection.IsInit() && !softEdge.IsInit())
+			{
+				return;
+			}
+			
 			pWriter->StartNode(L"a:effectLst");
 			pWriter->EndAttributes();
 			

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h

@@ -122,7 +122,20 @@ namespace PPTX
 				pWriter->WriteAttribute(L"prst", prst.get());
 				pWriter->EndAttributes();
 				
-				Color.toXmlWriter(pWriter);
+				if (Color.is_init())
+				{
+					Color.toXmlWriter(pWriter);
+				}
+				else
+				{
+					pWriter->StartNode(L"a:scrgbClr");
+					pWriter->StartAttributes();
+					pWriter->WriteAttribute(L"r", 0);
+					pWriter->WriteAttribute(L"g", 0);
+					pWriter->WriteAttribute(L"b", 0);
+					pWriter->EndAttributes();
+					pWriter->EndNode(L"a:scrgbClr");
+				}
 
 				pWriter->EndNode(L"a:prstShdw");
 			}

X2tConverter/src/ASCConverters.cpp

@@ -1000,7 +1000,7 @@ namespace NExtractTools
 			}
 			else
 			{
-				nRes = dir2zip(sFrom, sTo);
+				nRes = dir2zip(sResultPptxDir, sTo);
 			}
 		}
         return nRes;