Bug 26079 - Теряются ссылки в автофигурах при переоткрытии документа.

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

ASCOfficePPTXFile/PPTXFormat/FileFactory.cpp

@@ -120,6 +120,8 @@ namespace PPTX
 		{
 			return smart_ptr<PPTX::File>(new PPTX::Image(filename));
 		}
+		else if(strT == PPTX::FileTypes::HyperLink)
+			return smart_ptr<PPTX::File>(new PPTX::HyperLink(relation.target()));
 		
 		return smart_ptr<PPTX::File>(new PPTX::UnknowTypeFile());
 	}

ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.cpp

@@ -10,21 +10,30 @@ namespace PPTX
 {
 	namespace Logic
 	{
-		CString Hyperlink::GetFullHyperlinkName()const
+		CString Hyperlink::GetFullHyperlinkName(FileContainer* pRels)const
 		{
 			if(id.IsInit() && *id != _T(""))
 			{
 				PPTX::RId rid(*id);
 
 				CString sLink = _T("");
-				if(parentFileIs<Slide>())
-					sLink = parentFileAs<Slide>().GetFullHyperlinkNameFromRId(rid);
-				else if(parentFileIs<SlideLayout>())
-					sLink = parentFileAs<SlideLayout>().GetFullHyperlinkNameFromRId(rid);
-				else if(parentFileIs<SlideMaster>())
-					sLink = parentFileAs<SlideMaster>().GetFullHyperlinkNameFromRId(rid);
-				else if(parentFileIs<Theme>())
-					sLink = parentFileAs<Theme>().GetFullHyperlinkNameFromRId(rid);
+				if (pRels != NULL)
+				{
+					smart_ptr<PPTX::HyperLink> p = pRels->hyperlink(rid);
+					if (p.is_init())
+						sLink = p->Uri().m_strFilename;
+				}
+				if(sLink.IsEmpty())
+				{
+					if(parentFileIs<Slide>())
+						sLink = parentFileAs<Slide>().GetFullHyperlinkNameFromRId(rid);
+					else if(parentFileIs<SlideLayout>())
+						sLink = parentFileAs<SlideLayout>().GetFullHyperlinkNameFromRId(rid);
+					else if(parentFileIs<SlideMaster>())
+						sLink = parentFileAs<SlideMaster>().GetFullHyperlinkNameFromRId(rid);
+					else if(parentFileIs<Theme>())
+						sLink = parentFileAs<Theme>().GetFullHyperlinkNameFromRId(rid);
+				}
 				
 				sLink.Replace(TCHAR('\\'), TCHAR('/'));
 				sLink.Replace(_T("//"), _T("/"));

ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.h

@@ -57,7 +57,11 @@ namespace PPTX
 
 				if (id.is_init())
 				{
-					CString str = GetFullHyperlinkName();
+					FileContainer* pRels = NULL;
+					if (pWriter->m_pCommonRels->is_init())
+						pRels = pWriter->m_pCommonRels->operator ->();
+
+					CString str = GetFullHyperlinkName(pRels);
 					pWriter->WriteString1(0, str);
 				}
 
@@ -195,7 +199,7 @@ namespace PPTX
 					snd->SetParentPointer(this);
 			}
 
-			virtual CString GetFullHyperlinkName()const;
+			virtual CString GetFullHyperlinkName(FileContainer* pRels)const;
 		};
 	} // namespace Logic
 } // namespace PPTX