ошибка: после DrawingConverter->SetDstContentRels мог не вызваться метод SaveDstContentRels

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

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -58,18 +58,12 @@ namespace Writers
 			for(int i = 0, length = m_aHeaders.size(); i < length; ++i)
 			{
 				HdrFtrItem* pHeader = m_aHeaders[i];
-				if(false == pHeader->IsEmpty())
-				{
-					WriteItem(_T("header"), pHeader->m_sFilename, pHeader->Header, true);
-				}
+				WriteItem(_T("header"), pHeader->m_sFilename, pHeader->Header, true);
 			}
 			for(int i = 0, length = m_aFooters.size(); i < length; ++i)
 			{
 				HdrFtrItem* pFooter = m_aFooters[i];
-				if(false == pFooter->IsEmpty())
-				{
-					WriteItem(_T("footer"), pFooter->m_sFilename, pFooter->Header, false);
-				}
+				WriteItem(_T("footer"), pFooter->m_sFilename, pFooter->Header, false);
 			}
 		}
 		void WriteItem(CString sHeader, CString& sFilename, ContentWriter& m_oWriter, bool bHeader)

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -5943,11 +5943,8 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItem(BYTE type, long length, void* poRes
 			Binary_DocumentTableReader oBinary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, poHdrFtrItem->Header, NULL);
 			res = Read1(length, &Binary_HdrFtrTableReader::ReadHdrFtrItemContent, this, &oBinary_DocumentTableReader);
 
-			if(false == poHdrFtrItem->IsEmpty())
-			{
-				CString sRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir + _T("\\word\\_rels\\") + poHdrFtrItem->m_sFilename + _T(".rels");
-				m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(sRelsPath);
-			}
+			CString sRelsPath = m_oFileWriter.m_oDocumentWriter.m_sDir + _T("\\word\\_rels\\") + poHdrFtrItem->m_sFilename + _T(".rels");
+			m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(sRelsPath);
 		}
 	}
 	else