pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs in hwp conversion

Browse Source
This commit is contained in:
Green
2025-02-28 15:42:49 +03:00
parent 5cb7ad11e4
commit ea475e2828
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
View File

@ -291,7 +291,7 @@ bool CConverter2OOXML::IsRasterFormat(const HWP_STRING& sFormat)
return L"png" == sFormat || L"jpg" == sFormat || L"jpeg" == sFormat || L"bmp" == sFormat;
}
void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
{
if (nullptr == pCharacter)
return;
@ -301,7 +301,7 @@ void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short sh
case ECtrlCharType::PARAGRAPH_BREAK:
{
if (!oState.m_bOpenedP)
break;
OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
oState.m_bOpenedP = false;
oBuilder.WriteString(L"</w:p>");
@ -522,7 +522,7 @@ void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUt
}
case ECtrlObjectType::Character:
{
WriteCharacter((const CCtrlCharacter*)pCtrl, pParagraph->GetShapeID(), oBuilder, oState);
WriteCharacter((const CCtrlCharacter*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
break;
}
case ECtrlObjectType::Shape: