From 5bc1c8d8609e7dac5935ea4d00f1e4ff8ea86f3e Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Thu, 13 Feb 2025 15:12:58 +0300 Subject: [PATCH] fix bug #73215 --- OdfFile/Writer/Converter/MathConverter.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OdfFile/Writer/Converter/MathConverter.cpp b/OdfFile/Writer/Converter/MathConverter.cpp index afb155f1f2..293d47479e 100644 --- a/OdfFile/Writer/Converter/MathConverter.cpp +++ b/OdfFile/Writer/Converter/MathConverter.cpp @@ -177,7 +177,7 @@ namespace Oox2Odf int base_font_size = current_font_size.empty() ? 12 : current_font_size.back(); std::wstring base_font_color; - if (odf_context()->is_child_text_context()) + if (odf_context()->is_child_text_context() && odf_context()->drawing_context()) { if (odf_context()->drawing_context()->get_text_properties()) { @@ -187,6 +187,16 @@ namespace Oox2Odf } } } + else + { + if (odf_context()->text_context()->get_text_properties()) + { + if (odf_context()->text_context()->get_text_properties()->fo_color_) + { + base_font_color = odf_context()->drawing_context()->get_text_properties()->fo_color_->get_hex_value(); + } + } + } bool bStart = odf_context()->start_math(base_font_size, base_font_color); for (size_t i = 0; i < oox_math->m_arrItems.size(); ++i)