From 63bd2a1cbfb1314b22b9cc90ea19810790024254 Mon Sep 17 00:00:00 2001
From: Kamil Kerimov <kamil.kerimov@onlyoffice.com>
Date: Mon, 6 May 2024 15:49:48 +0500
Subject: [PATCH] Fix bug #67815

---
 OdfFile/Reader/Converter/oox_drawing.cpp      | 1 +
 OdfFile/Writer/Format/odf_drawing_context.cpp | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/OdfFile/Reader/Converter/oox_drawing.cpp b/OdfFile/Reader/Converter/oox_drawing.cpp
index 42b27e2049..19b7ec5113 100644
--- a/OdfFile/Reader/Converter/oox_drawing.cpp
+++ b/OdfFile/Reader/Converter/oox_drawing.cpp
@@ -239,6 +239,7 @@ void oox_serialize_effects(std::wostream & strm, const std::vector<odf_reader::_
 
 					double dist = sqrt(offsetX * offsetX + offsetY * offsetY);
 					double dir = (offsetX != 0)  ? atan(offsetY / offsetX) * 180. / 3.1415926 : 0;
+					if (offsetX < 0) dir += 180;
 					if (dir < 0) dir += 360;
 
 					CP_XML_ATTR(L"dist", (int)(dist)); 
diff --git a/OdfFile/Writer/Format/odf_drawing_context.cpp b/OdfFile/Writer/Format/odf_drawing_context.cpp
index 576ce8e805..ef9018a1bb 100644
--- a/OdfFile/Writer/Format/odf_drawing_context.cpp
+++ b/OdfFile/Writer/Format/odf_drawing_context.cpp
@@ -1471,11 +1471,7 @@ void odf_drawing_context::set_shadow(int type, std::wstring hexColor, _CP_OPT(do
 		hexColor = std::wstring(L"#") + hexColor;
 
 	impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_offset_x_ = length(length(dist_pt, length::pt).get_value_unit(length::cm), length::cm);
-	
-	if (dist_pt_y > 0)
-		impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_offset_y_ = length(length(dist_pt_y, length::pt).get_value_unit(length::cm), length::cm);
-	else
-		impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_offset_y_ = length(length(dist_pt, length::pt).get_value_unit(length::cm), length::cm);
+	impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_offset_y_ = length(length(dist_pt_y, length::pt).get_value_unit(length::cm), length::cm);
 	
 	impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_ = shadow_type1(shadow_type1::Visible);
 	if (opacity) impl_->current_graphic_properties->common_shadow_attlist_.draw_shadow_opacity_ = *opacity;