pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 01:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix and correct bullets. But it's need refactoring

Browse Source
This commit is contained in:
Ivan Morozov
2022-01-25 11:43:24 +03:00
parent 2dc6aa71de
commit 4e8df0bc79
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
View File

@ -1594,7 +1594,7 @@ std::wstring CShapeWriter::WriteBullets(CTextPFRun *pPF, CRelsGenerator* pRels)
buWrt.WriteString(L"\"/></a:buBlip>");
}
}
else if (pPF->bulletChar.is_init())
else if (pPF->bulletChar.is_init() && (pPF->bulletAutoNum.is_init() ? pPF->bulletAutoNum->isDefault() : true))
{
wchar_t bu = pPF->bulletChar.get();
buWrt.WriteString(std::wstring(L"<a:buChar char=\""));

6
ASCOfficePPTXFile/Editor/Drawing/TextStructures.h
View File

@ -123,7 +123,11 @@ namespace PPT_FORMAT
{
public:
NSCommon::nullable<USHORT> startAt;
NSCommon::nullable_string type;
NSCommon::nullable_string type;
inline bool isDefault()const
{return type.get_value_or(L"arabicPeriod") == L"arabicPeriod" &&
(startAt.is_init() ? *startAt == 1 : true);}
};