merge from branches\Docx2DoctConverter Revision: 59733

поправлено - выбор шаблона для слайда при чтении из бинарника.



git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59737 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/Editor/PPTXWriter.h

@@ -218,13 +218,16 @@ namespace NSBinPptxRW
 				m_oReader.Seek(pPair->second);
 				m_oReader.Skip(6); // type + len + start attr
 
+				int index =0;
 				while (true)
 				{
 					BYTE _at = m_oReader.GetUChar();
 					if (_at == NSBinPptxRW::g_nodeAttributeEnd)
 						break;
 
-					m_arSlides_Layout[_at] = m_oReader.GetULong();
+					//m_arSlides_Layout[_at] = m_oReader.GetULong();    ,   -  - oBinaryWriter.WriteInt1(0, oBinaryWriter.m_pCommon->m_oSlide_Layout_Rels[i]);
+					if (index < m_arSlides_Layout.size())
+						m_arSlides_Layout[index++] = m_oReader.GetULong();
 				}
 			}