(2.0.0.176): ASCOfficeDocxFile2

Bug 26180 - [Conversion] Документ содержащий ссылку на отсутствующую страницу в wikipedia не открывается в MS Word

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -3005,15 +3005,7 @@ public:
 			CHyperlink oHyperlink;
 			res = Read1(length, &Binary_DocumentTableReader::ReadHyperlink, this, &oHyperlink);
 			if(!oHyperlink.sLink.IsEmpty())
-			{
-				long rId;
-				BSTR bstrHref = oHyperlink.sLink.AllocSysString();
-				m_oFileWriter.m_pDrawingConverter->WriteRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"), bstrHref, _T("External"), &rId);
-				SysFreeString(bstrHref);
-				CString srId;srId.Format(_T("rId%d"), rId);
-				oHyperlink.rId = srId;
 				oHyperlink.Write(GetRunStringWriter());
-			}
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -4661,7 +4661,7 @@ namespace BinDocxRW
 						OOX::WritingElement* we = pGraphic->m_arrItems[i];
 						if(OOX::et_c_chart == we->getType())
 						{
-							pChart = static_cast<OOX::Drawing::CChart*>(item);
+							pChart = static_cast<OOX::Drawing::CChart*>(we);
 							break;
 						}
 					}

ASCOfficeDocxFile2/DocxFile2.h

@@ -63,6 +63,7 @@ public:
 	CAVSOfficeDocxFile2()
 	{
 		m_oBinaryFileWriter = NULL;
+		m_pCurFileWriter = NULL;
 		m_bSaveChartAsImg = false;
 		m_bIsNoBase64Save = false;
 	}

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//175
-#define INTVER 2,0,0,175
-#define STRVER "2,0,0,175\0"
+//176
+#define INTVER 2,0,0,176
+#define STRVER "2,0,0,176\0"