fix double write attribute in background

fix bug 34177
read attributes (from line props, shape props , effects, 3D) without namespace

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp

@@ -668,27 +668,27 @@ void NSPresentationEditor::CPPTXWriter::WriteColorScheme(CStringWriter& oStringW
 	
     oStringWriter.WriteString(L"<a:dk1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[14].GetLONG_RGB(), L"%06X") + L"\"/></a:dk1>");
 	
-    oStringWriter.WriteString(L"<a:lt1><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[13].GetLONG_RGB(), L"%06X") + L"\"/></a:lt1>");
+    oStringWriter.WriteString(L"<a:lt1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[13].GetLONG_RGB(), L"%06X") + L"\"/></a:lt1>");
 	
-    oStringWriter.WriteString(L"<a:dk2><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[16].GetLONG_RGB(), L"%06X") + L"\"/></a:dk2>");
+    oStringWriter.WriteString(L"<a:dk2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[16].GetLONG_RGB(), L"%06X") + L"\"/></a:dk2>");
 	
-    oStringWriter.WriteString(L"<a:lt2><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[15].GetLONG_RGB(), L"%06X") + L"\"/></a:lt2>");
+    oStringWriter.WriteString(L"<a:lt2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[15].GetLONG_RGB(), L"%06X") + L"\"/></a:lt2>");
 	
-    oStringWriter.WriteString(L"<a:accent1><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[5].GetLONG_RGB(), L"%06X") + L"\"/></a:accent1>");
+    oStringWriter.WriteString(L"<a:accent1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[5].GetLONG_RGB(), L"%06X") + L"\"/></a:accent1>");
 	
-    oStringWriter.WriteString(L"<a:accent2><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[6].GetLONG_RGB(), L"%06X") + L"\"/></a:accent2>");
+    oStringWriter.WriteString(L"<a:accent2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[6].GetLONG_RGB(), L"%06X") + L"\"/></a:accent2>");
 	
-    oStringWriter.WriteString(L"<a:accent3><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[7].GetLONG_RGB(), L"%06X") + L"\"/></a:accent3>");
+    oStringWriter.WriteString(L"<a:accent3><a:srgbClr val=\"" + XmlUtils::IntToString(colors[7].GetLONG_RGB(), L"%06X") + L"\"/></a:accent3>");
 	
-    oStringWriter.WriteString(L"<a:accent4><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[8].GetLONG_RGB(), L"%06X") + L"\"/></a:accent4>");
+    oStringWriter.WriteString(L"<a:accent4><a:srgbClr val=\"" + XmlUtils::IntToString(colors[8].GetLONG_RGB(), L"%06X") + L"\"/></a:accent4>");
 	
-    oStringWriter.WriteString(L"<a:accent5><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[9].GetLONG_RGB(), L"%06X") + L"\"/></a:accent5>");
+    oStringWriter.WriteString(L"<a:accent5><a:srgbClr val=\"" + XmlUtils::IntToString(colors[9].GetLONG_RGB(), L"%06X") + L"\"/></a:accent5>");
 	
-    oStringWriter.WriteString(L"<a:accent6><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[10].GetLONG_RGB(), L"%06X") + L"\"/></a:accent6>");
+    oStringWriter.WriteString(L"<a:accent6><a:srgbClr val=\"" + XmlUtils::IntToString(colors[10].GetLONG_RGB(), L"%06X") + L"\"/></a:accent6>");
 	
-    oStringWriter.WriteString(L"<a:hlink><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[11].GetLONG_RGB(), L"%06X") + L"\"/></a:hlink>");
+    oStringWriter.WriteString(L"<a:hlink><a:srgbClr val=\"" + XmlUtils::IntToString(colors[11].GetLONG_RGB(), L"%06X") + L"\"/></a:hlink>");
 	
-    oStringWriter.WriteString(L"<a:folHlink><a:srgbClr val=\"%" + XmlUtils::IntToString(colors[12].GetLONG_RGB(), L"%06X") + L"\"/></a:folHlink>");
+    oStringWriter.WriteString(L"<a:folHlink><a:srgbClr val=\"" + XmlUtils::IntToString(colors[12].GetLONG_RGB(), L"%06X") + L"\"/></a:folHlink>");
 
     oStringWriter.WriteString(L"</a:clrScheme>");
 	if (extra)

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -4841,6 +4841,8 @@ HRESULT CDrawingConverter::SaveObjectEx(LONG lStart, LONG lLength, const std::ws
 }
 std::wstring CDrawingConverter::SaveObjectBackground(LONG lStart, LONG lLength)
 {
+	if (lLength < 1) return L"";
+
 	m_pReader->Seek(lStart);
 
 	++m_nCurrentIndexObject;

ASCOfficePPTXFile/PPTXFormat/Logic/Backdrop.h

@@ -88,7 +88,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader, nullable_int & x, nullable_int & y, nullable_int & z )
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("x"), x)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("y"), y)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("z"), z)

ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h

@@ -59,7 +59,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("w"), w)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("h"), h)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("prst"), prst)

ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h

@@ -74,7 +74,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("prst"), prst)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("fov"), fov)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("zoom"), zoom)

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SysClr.h

@@ -170,7 +170,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("val"), val)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.h

@@ -67,7 +67,7 @@ namespace PPTX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
+				WritingElement_ReadAttributes_Start_No_NS	( oReader )
 					WritingElement_ReadAttributes_Read_if	  ( oReader, L"name",	name)
 					WritingElement_ReadAttributes_Read_else_if( oReader, L"type",	type)
 				WritingElement_ReadAttributes_End	( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.h

@@ -63,8 +63,6 @@ namespace PPTX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
-				WritingElement_ReadAttributes_End	( oReader )
 			}
 			
 			virtual void fromXML(XmlUtils::CXmlNode& node);

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaBiLevel.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_ReadSingle     ( oReader, _T("thresh"), thresh)
 				WritingElement_ReadAttributes_End( oReader )
 				

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaModFix.h

@@ -64,7 +64,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("amt"), amt)
 				WritingElement_ReadAttributes_End( oReader )
 				

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaOutset.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("rad"), rad)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaRepl.h

@@ -64,7 +64,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("a"), a)
 				WritingElement_ReadAttributes_End( oReader )
 				

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/BiLevel.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("thresh"), thresh)
 				WritingElement_ReadAttributes_End( oReader )
 				

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blend.h

@@ -79,7 +79,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("blend"), blend)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blur.h

@@ -66,7 +66,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("rad"), rad)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("grow"), grow)
 				WritingElement_ReadAttributes_End( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h

@@ -81,7 +81,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("useA"), useA)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("ref"), ref)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/FillOverlay.h

@@ -81,7 +81,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("blend"), blend)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h

@@ -77,7 +77,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("rad"), rad)
 				WritingElement_ReadAttributes_End( oReader )
 				

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/HslEffect.h

@@ -66,7 +66,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("hue"), hue)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("sat"), sat)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("lum"), lum)

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h

@@ -80,7 +80,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("blurRad"), blurRad)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dir"), dir)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dist"), dist)

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("bright"), bright)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("contrast"), contrast)
 				WritingElement_ReadAttributes_End( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h

@@ -89,7 +89,7 @@ namespace PPTX
 		}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("blurRad"), blurRad)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dir"), dir)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dist"), dist)

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h

@@ -84,7 +84,7 @@ namespace PPTX
 		}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("prst"), prst)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dir"),	 dir)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dist"), dist)

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h

@@ -79,7 +79,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("blurRad"), blurRad)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dir"), dir)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("fadeDir"), fadeDir)

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("tx"), tx)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("ty"), ty)
 				WritingElement_ReadAttributes_End( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/SoftEdge.h

@@ -64,7 +64,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_ReadSingle ( oReader, _T("rad"), rad)
 				WritingElement_ReadAttributes_End( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/TintEffect.h

@@ -65,7 +65,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("amt"), amt)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("hue"), hue)
 				WritingElement_ReadAttributes_End( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h

@@ -70,7 +70,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("kx"), kx)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("ky"), ky)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("sx"), sx)

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.h

@@ -77,7 +77,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("r:embed"), embed)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("r:link"), link )
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("cstate"), cstate )

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h

@@ -111,7 +111,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
+				WritingElement_ReadAttributes_Start_No_NS	( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("dpi"), dpi)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("rotWithShape"), rotWithShape )
 				WritingElement_ReadAttributes_End	( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/NoFill.h

@@ -67,8 +67,6 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
-				WritingElement_ReadAttributes_End	( oReader )
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
@@ -123,8 +121,6 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
-				WritingElement_ReadAttributes_End	( oReader )
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/PattFill.h

@@ -86,7 +86,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
+				WritingElement_ReadAttributes_Start_No_NS	( oReader )
 					WritingElement_ReadAttributes_ReadSingle ( oReader, _T("prst"), prst )
 				WritingElement_ReadAttributes_End	( oReader )
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h

@@ -73,7 +73,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("algn"), algn )
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("flip"), flip )
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("sx"), sx )

ASCOfficePPTXFile/PPTXFormat/Logic/LightRig.h

@@ -75,7 +75,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("dir"), dir)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("rig"), rig)
 				WritingElement_ReadAttributes_End( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h

@@ -56,7 +56,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start	( oReader )
+				WritingElement_ReadAttributes_Start_No_NS	( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("ang"), ang)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("scaled"), scaled)
 				WritingElement_ReadAttributes_End	( oReader )

ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h

@@ -50,7 +50,9 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(Ln)
-			PPTX_LOGIC_BASE2(Ln)
+			Ln()
+			{
+			}
 
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h

@@ -56,7 +56,7 @@ namespace PPTX
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("t"), t )
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("l"), l )
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("r"), r )

ASCOfficePPTXFile/PPTXFormat/Logic/Rot.h

@@ -58,7 +58,7 @@ namespace PPTX
 			{
 				nullable_int lat_, lon_, rev_;
 
-				WritingElement_ReadAttributes_Start( oReader )
+				WritingElement_ReadAttributes_Start_No_NS( oReader )
 					WritingElement_ReadAttributes_Read_if		( oReader, _T("lat"), lat_)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("lon"), lon_)
 					WritingElement_ReadAttributes_Read_else_if	( oReader, _T("rev"), rev_)

ASCOfficePPTXFile/PPTXFormat/Logic/UniColor.cpp

@@ -44,6 +44,7 @@ namespace PPTX
 
 		UniColor::UniColor()
 		{
+			Color.reset();
 		}
 
 

ASCOfficePPTXFile/PPTXFormat/Logic/UniEffect.cpp

@@ -69,11 +69,11 @@ namespace PPTX
 	{
 		UniEffect::UniEffect()
 		{
+			Effect.reset();
 		}
 
 		UniEffect::~UniEffect()
 		{
-			//Effect.reset();
 		}
 
 		UniEffect::UniEffect(XmlUtils::CXmlNode& node)

ASCOfficePPTXFile/PPTXFormat/Logic/UniFill.h

@@ -49,7 +49,11 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(UniFill)
-			PPTX_LOGIC_BASE2(UniFill)
+			UniFill()
+			{
+				m_type = notInit;
+				Fill.reset();
+			}
 
 			virtual OOX::EElementType getType() const
 			{

Common/DocxFormat/Source/DocxFormat/Logic/Vml.h

@@ -662,9 +662,6 @@ namespace OOX
 
 				sResult += CVmlCommonElements::WriteAttributes();
 								
-				ComplexTypes_WriteAttribute ( _T("o:bwmode=\""),			m_oBwMode );
-				ComplexTypes_WriteAttribute ( _T("o:bwpure=\""),			m_oBwPure );
-				ComplexTypes_WriteAttribute ( _T("o:bwnormal=\""),			m_oBwNormal );
 				ComplexTypes_WriteAttribute ( _T("o:targetscreensize=\""),	m_oTargetScreenSize );
 
 				sResult += _T(">");
@@ -684,45 +681,15 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
-				if ( oReader.GetAttributesCount() <= 0 )
-					return;
-				
-				if ( !oReader.MoveToFirstAttribute() )
-					return;
-				
-				std::wstring wsName = oReader.GetName();
-				while( !wsName.empty() )
-				{
-					wchar_t wsChar = wsName[0];
-					switch ( wsChar )
-					{
-					case 'o':
-						if      ( _T("o:bwmode")   == wsName ) m_oBwMode             = oReader.GetText();
-						else if ( _T("o:bwnormal") == wsName ) m_oBwNormal           = oReader.GetText();
-						else if ( _T("o:bwpure")   == wsName ) m_oBwPure             = oReader.GetText();
-						break;
-
-					case 't':
-						if      ( _T("o:targetscreensize") == wsName ) m_oTargetScreenSize = oReader.GetText();
-						break;
-					}
-
-					if ( !oReader.MoveToNextAttribute() )
-						break;
-
-					wsName = oReader.GetName();
-				}
-				oReader.MoveToElement();
+				WritingElement_ReadAttributes_Start( oReader )
+					WritingElement_ReadAttributes_ReadSingle( oReader, _T("o:targetscreensize"), m_oTargetScreenSize)
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
 
 	// Attributes
-			nullable<SimpleTypes::CBWMode<>>					m_oBwMode;
-			nullable<SimpleTypes::CBWMode<>>					m_oBwNormal;
-			nullable<SimpleTypes::CBWMode<>>					m_oBwPure;
-			nullable<SimpleTypes::CScreenSize<>>				m_oTargetScreenSize;
+			nullable<SimpleTypes::CScreenSize<>> m_oTargetScreenSize;
 
 		};
 		//--------------------------------------------------------------------------------

Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h

@@ -347,12 +347,12 @@ namespace OOX
 					m_oCols->toXML(sXml);
 				if(m_oSheetData.IsInit())
 					m_oSheetData->toXML(sXml);
-				for (size_t nIndex = 0, nLength = m_arrConditionalFormatting.size(); nIndex < nLength; ++nIndex)
-					m_arrConditionalFormatting[nIndex]->toXML(sXml);
 				if(m_oAutofilter.IsInit())
 					m_oAutofilter->toXML(sXml);
 				if(m_oMergeCells.IsInit())
 					m_oMergeCells->toXML(sXml);
+				for (size_t nIndex = 0, nLength = m_arrConditionalFormatting.size(); nIndex < nLength; ++nIndex)
+					m_arrConditionalFormatting[nIndex]->toXML(sXml);
 				if(m_oHyperlinks.IsInit())
 					m_oHyperlinks->toXML(sXml);
 				if(m_oPrintOptions.IsInit())

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.3.441
+VERSION = 2.0.3.444
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t

X2tConverter/src/ASCConverters.cpp

@@ -366,9 +366,9 @@ namespace NExtractTools
 			else return AVS_FILEUTILS_ERROR_CONVERT;
 		}
 
-        return pptx_dir2pptt_bin(sTempUnpackedPPTX, sTo, params);
+        return pptx_dir2pptt_bin(sTempUnpackedPPTX, sTo, sTemp, params);
 	}
-    int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params)
+    int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
     {
         // convert unzipped pptx to unzipped pptt
         CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL);
@@ -377,6 +377,7 @@ namespace NExtractTools
 
         if (pptx_file)
         {
+            pptx_file->put_TempDirectory(sTemp);
             pptx_file->SetFontDir (params.getFontPath());
             nRes = (S_OK == pptx_file->OpenFileToPPTY (sFrom, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
 
@@ -2192,7 +2193,7 @@ namespace NExtractTools
        }
        else if(AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION == nFormatTo)
        {
-           nRes = pptx_dir2pptt_bin(sFrom, sTo, params);
+           nRes = pptx_dir2pptt_bin(sFrom, sTo, sTemp, params);
        }
        else
        {
@@ -2200,7 +2201,7 @@ namespace NExtractTools
            NSDirectory::CreateDirectory(sPpttDir);
            std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin");
          
-		   nRes = pptx_dir2pptt_bin(sFrom, sTFile, params);
+           nRes = pptx_dir2pptt_bin(sFrom, sTFile, sTemp, params);
            if(SUCCEEDED_X2T(nRes))
            {
                nRes = fromPpttBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params);

X2tConverter/src/ASCConverters.h

@@ -63,7 +63,7 @@ namespace NExtractTools
 	int xlst2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
 
     int pptx2pptt_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int pptx_dir2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    int pptx_dir2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
     int pptx2pptt			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 	int pptt_bin2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
     int pptt_bin2pptx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);

XlsxSerializerCom/Reader/ChartFromToBinary.cpp

@@ -3224,7 +3224,7 @@ namespace BinXlsxRW
 			poVal->m_ItemsElementName0.push_back(eElemtype);
 			
 			PPTX::Logic::TxBody * pNewElem = new PPTX::Logic::TxBody();
-			res = ReadCT_SpPr(0, length, pNewElem);
+			res = ReadCT_TxPr(0, length, pNewElem);
 			poVal->m_Items.push_back(pNewElem);
 		}
 		else if(c_oserct_dlblEXTLST == type)