From eb95a37dfee26e44ea2fe49bede4de41560ecb99 Mon Sep 17 00:00:00 2001
From: Kamil Kerimov <kamil.kerimov@onlyoffice.com>
Date: Fri, 15 Dec 2023 17:54:58 +0500
Subject: [PATCH] Fix bug #65503

---
 .../Reader/Converter/pptx_slide_context.cpp   |  1 -
 OdfFile/Reader/Format/anim_elements.cpp       | 40 ++++++++++++++-----
 OdfFile/Reader/Format/draw_page.cpp           |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/OdfFile/Reader/Converter/pptx_slide_context.cpp b/OdfFile/Reader/Converter/pptx_slide_context.cpp
index 3b69adf2fb..3a9d5f1845 100644
--- a/OdfFile/Reader/Converter/pptx_slide_context.cpp
+++ b/OdfFile/Reader/Converter/pptx_slide_context.cpp
@@ -1012,7 +1012,6 @@ void pptx_slide_context::serialize_objects(std::wostream & strm)
 			}
 		}
 	}
-	process_drawings();
 	impl_->get_drawings()->serialize(strm);   
 }
 
diff --git a/OdfFile/Reader/Format/anim_elements.cpp b/OdfFile/Reader/Format/anim_elements.cpp
index ff4f8c4b7b..1a1b9dbb78 100644
--- a/OdfFile/Reader/Format/anim_elements.cpp
+++ b/OdfFile/Reader/Format/anim_elements.cpp
@@ -47,6 +47,7 @@
 #include <xml/xmlchar.h>
 #include <xml/simple_xml_writer.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 #include <unordered_map>
 #include <vector>
 
@@ -333,7 +334,9 @@ static std::wstring pptx_convert_animation_function(std::wstring animation_funct
 
 static std::wstring pptx_convert_smil_begin(const std::wstring& smil_begin)
 {
-	if(smil_begin == L"next")
+	if (smil_begin == L"next")
+		return L"indefinite";
+	else if (smil_begin == L"indefinite")
 		return L"indefinite";
 	if (boost::ends_with(smil_begin, L"click"))
 		return smil_begin;
@@ -1159,12 +1162,15 @@ void anim_audio::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	audio_attlist_.add_attributes(Attributes);
 }
 
+static bool is_absolute_path(const std::wstring& path) {
+	boost::filesystem::path p(path);
+	return p.is_absolute();
+}
+
 void anim_audio::pptx_convert(oox::pptx_conversion_context & Context)
 {
 	oox::pptx_slide_context& slideContext = Context.get_slide_context();
 	oox::pptx_animation_context& animationContext = Context.get_slide_context().get_animation_context();
-	
-	animationContext.start_anim_audio();
 
 	if (audio_attlist_.xlink_href_)
 	{
@@ -1184,18 +1190,30 @@ void anim_audio::pptx_convert(oox::pptx_conversion_context & Context)
 			href = audioPath;
 		}
 
-		const std::wstring name = NSFile::GetFileName(href);
+		std::wstring relative_href = href;
+		if (!is_absolute_path(href))
+		{
+			relative_href = Context.root()->get_folder() + FILE_SEPARATOR_STR + href;
+		}
 
-		std::wstring ref;
-		bool isInternal;
-		const std::wstring& rId = slideContext.get_mediaitems()->add_or_find_anim_audio(href, isInternal, ref);
+		if (NSFile::CFileBinary::Exists(relative_href))
+		{
+			const std::wstring name = NSFile::GetFileName(href);
 
-		slideContext.add_rels(true, rId, ref, oox::_rels_type::typeAudio);
-		
-		animationContext.add_anim_audio(rId, name);
+			std::wstring ref;
+			bool isInternal;
+			const std::wstring& rId = slideContext.get_mediaitems()->add_or_find_anim_audio(href, isInternal, ref);
+
+			slideContext.add_rels(true, rId, ref, oox::_rels_type::typeAudio);
+
+			animationContext.start_anim_audio();
+
+			animationContext.add_anim_audio(rId, name);
+
+			animationContext.end_anim_audio();
+		}
 	}
 
-	animationContext.end_anim_audio();
 }
 
 ////////////////////////////////////////////////////////////////
diff --git a/OdfFile/Reader/Format/draw_page.cpp b/OdfFile/Reader/Format/draw_page.cpp
index 4e40193f40..869afdfa35 100644
--- a/OdfFile/Reader/Format/draw_page.cpp
+++ b/OdfFile/Reader/Format/draw_page.cpp
@@ -200,11 +200,11 @@ void draw_page::pptx_convert(oox::pptx_conversion_context & Context)
 
 	if (animation_)
 	{
-		Context.get_slide_context().get_animation_context().clear();
 		animation_->pptx_convert(Context);
 	}
 
 	Context.end_page();
+	Context.get_slide_context().get_animation_context().clear();
 
  	if (presentation_notes_)
 	{