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 additional sdtPr

Browse Source
This commit is contained in:
ElenaSubbotina
2025-02-12 15:35:26 +03:00
parent 8098fec345
commit f145378002
9 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OOXML/DocxFormat/Logic/Sdt.cpp
View File

@ -1635,8 +1635,8 @@ namespace OOX
WritingElement_WriteNode_2(m_oFormPr);
WritingElement_WriteNode_2(m_oTextFormPr);
WritingElement_WriteNode_2(m_oComplexFormPr);
WritingElement_WriteNode_1(L"<w:border ", m_oBorder);
WritingElement_WriteNode_1(L"<w:shd ", m_oShd);
WritingElement_WriteNode_3(L"<w:border ", m_oBorder);
WritingElement_WriteNode_3(L"<w:shd ", m_oShd);
return sResult;
}

10
OOXML/DocxFormat/WritingElement.h
View File

@ -115,7 +115,15 @@ namespace OOX
#define WritingElement_WriteNode_2( oValue ) \
if ( oValue.IsInit() )\
sResult += oValue->toXML();
//-----------------------------------------------------------------------------------------------
#define WritingElement_WriteNode_3( sStartNodeString, oValue ) \
if ( oValue.IsInit() )\
{\
sResult += sStartNodeString;\
sResult += oValue->ToString(false);\
sResult += _T("/>");\
}
//-----------------------------------------------------------------------------------------------
#define WritingElement_ReadAttributes_ReadSingle2(Reader, AttrName, Value) \
if ( Reader.GetAttributesCount() > 0 ){\
if ( Reader.MoveToFirstAttribute() ){\