From a4c2eff0deceac5697f3ed2d76967ab2cedea437 Mon Sep 17 00:00:00 2001 From: Ivan Morozov Date: Wed, 9 Feb 2022 20:55:52 +0300 Subject: [PATCH] added simple text shadow --- .../PPTFormatLib/PPTXWriter/ShapeWriter.cpp | 22 +++++++++++-------- .../Editor/Drawing/TextStructures.h | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp index dcea70051a..cbd43a2f01 100644 --- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp +++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp @@ -482,7 +482,7 @@ std::wstring PPT_FORMAT::CShapeWriter::ConvertShadow(CShadow & shadow) } else { - needHiddenEffect = shadow.Visible; +// needHiddenEffect = shadow.Visible; shadow_writer.WriteString(L""); } shadow_writer.WriteString(L""); - if (needHiddenEffect) - { - std::wstring STRshadow; - STRshadow = L""; - STRshadow += shadow_writer.GetData(); - STRshadow += L""; - return STRshadow; - } +// if (needHiddenEffect) +// { +// std::wstring STRshadow; +// STRshadow = L""; +// STRshadow += shadow_writer.GetData(); +// STRshadow += L""; +// return STRshadow; +// } return shadow_writer.GetData(); } @@ -1351,6 +1351,10 @@ void PPT_FORMAT::CShapeWriter::WriteTextInfo(PPT_FORMAT::CTextCFRun* pLastCF) } // WriteHyperlink(nIndexPar); + if (pCF->FontShadow.get_value_or(false)) + { + m_oWriter.WriteString(L""); + } m_oWriter.WriteString(std::wstring(L"")); diff --git a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h index ed649a8842..85294d0e67 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h +++ b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h @@ -172,7 +172,7 @@ namespace PPT_FORMAT NSCommon::nullable_base FontItalic; NSCommon::nullable_base FontUnderline; NSCommon::nullable_base FontStrikeout; - NSCommon::nullable_base FontShadow; + NSCommon::nullable_bool FontShadow; NSCommon::nullable_base fontRef; // fontRef NSCommon::nullable_base eaFontRef; // eaFontRef