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

fix text in controls xlsx

Browse Source
This commit is contained in:
ElenaSubbotina
2025-06-21 16:42:56 +03:00
parent 2e1538b3dc
commit 482a821974
11 changed files with 153 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OOXML/DocxFormat/Logic/Shape.cpp
View File

@ -163,7 +163,7 @@ namespace OOX
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
if (m_arrItems[i])
{
sResult += m_arrItems[i]->toXML();
}

2
OOXML/DocxFormat/Logic/Shape.h
View File

@ -55,8 +55,6 @@ namespace OOX
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
virtual std::wstring toXML() const;
virtual EElementType getType() const;
// Childs
};
//--------------------------------------------------------------------------------

7
OOXML/DocxFormat/Logic/Vml.cpp
View File

@ -1843,13 +1843,14 @@ namespace OOX
sResult += L">";
if ( m_oTxtbxContent.IsInit() )
sResult += m_oTxtbxContent->toXML();
if (m_oText.IsInit())
{
sResult += L"<div>" + *m_oText + L"</div>";
}
else if (m_oTxtbxContent.IsInit())
{
sResult += m_oTxtbxContent->toXML(); //???
}
sResult += L"</v:textbox>";