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

Fix bug with non-nullptr conttext

Browse Source
This commit is contained in:
Alexey Nagaev
2025-04-07 17:05:56 +03:00
parent 7c9ae624e9
commit 9aa6bceddf
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DocxRenderer/src/logic/Page.cpp
View File

@ -63,6 +63,7 @@ namespace NSDocxRenderer
m_arOutputObjects.clear();
m_oCurrVectorGraphics.Clear();
m_oClipVectorGraphics.Clear();
m_oContBuilder.Clear();
m_arCompleteObjectsXml.clear();
}

10
DocxRenderer/src/logic/elements/ContText.cpp
View File

@ -875,10 +875,12 @@ namespace NSDocxRenderer
std::vector<CContTextBuilder::cont_ptr_t> CContTextBuilder::GetConts()
{
return std::move(m_arConts);
m_pCurrCont = nullptr;
}
std::vector<CContTextBuilder::cont_ptr_t> CContTextBuilder::GetDiacs()
{
return std::move(m_arDiacs);
m_pCurrCont = nullptr;
}
void CContTextBuilder::AddUnicode(
@ -1028,4 +1030,12 @@ namespace NSDocxRenderer
{
m_pCurrCont = nullptr;
}
void CContTextBuilder::Clear()
{
m_pCurrCont = nullptr;
m_arConts.clear();
m_arDiacs.clear();
m_oPrevFont.SetDefaultParams();
m_oPrevBrush.SetDefaultParams();
}
}

1
DocxRenderer/src/logic/elements/ContText.h
View File

@ -176,6 +176,7 @@ namespace NSDocxRenderer
bool bWriteStyleRaw = false);
void NullCurrCont();
void Clear();
private:
std::vector<cont_ptr_t> m_arConts;

2
DocxRenderer/test/main.cpp
View File

@ -77,6 +77,8 @@ int main(int argc, char *argv[])
oWorker.m_sDirectory = NSFile::GetProcessDirectory() + L"/fonts_cache";
oWorker.m_bIsNeedThumbnails = false;
oWorker.m_arAdditionalFolders.push_back(L"/home/flexus/Work/fonts");
if (!NSDirectory::Exists(oWorker.m_sDirectory))
NSDirectory::CreateDirectory(oWorker.m_sDirectory);