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

Merge pull request 'Fix bug #53908' (#534) from fix/rtf into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/534
This commit is contained in:
Elena Subbotina
2025-11-19 13:54:00 +00:00
parent 033c45b7a0 6167f23a08
commit 6df7a7e01e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MsBinaryFile/DocFile/BorderCode.h
View File

@ -88,6 +88,8 @@ namespace DocFileFormat
BorderCode( unsigned char* bytes, int size );
BorderCode( const BorderCode& bc );
unsigned char GetType() const { return brcType; }
bool GetNil() {return fNil;}
bool operator == ( const BorderCode& bc );
bool operator != ( const BorderCode& bc );

10
MsBinaryFile/DocFile/TableCellPropertiesMapping.cpp
View File

@ -190,7 +190,7 @@ namespace DocFileFormat
}
if (!IsTableBordersDefined(tapx->grpprl))
if (!IsTableBordersDefined(tapx->grpprl) || ( _tcDef.brcTop->GetType() != 0) || ( _tcDef.brcLeft->GetType() != 0) ||( _tcDef.brcRight->GetType() != 0) ||( _tcDef.brcBottom->GetType() != 0))
{
_brcTop = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcTop));
_brcLeft = std::shared_ptr<BorderCode>(new BorderCode(*_tcDef.brcLeft));
@ -443,28 +443,28 @@ namespace DocFileFormat
}
//append borders
if (_brcTop)
if ((_brcTop && _brcTop->GetType() != 0) || (_brcTop && _brcTop->GetNil()))
{
XMLTools::XMLElement topBorder( L"w:top" );
appendBorderAttributes(_brcTop.get(), &topBorder);
addOrSetBorder(_tcBorders, &topBorder );
}
if (_brcLeft )
if ((_brcLeft && _brcLeft->GetType() != 0) || (_brcLeft && _brcLeft->GetNil()))
{
XMLTools::XMLElement leftBorder( L"w:left" );
appendBorderAttributes(_brcLeft.get(), &leftBorder);
addOrSetBorder(_tcBorders, &leftBorder);
}
if (_brcBottom)
if ((_brcBottom && _brcBottom->GetType() != 0) || (_brcBottom && _brcBottom->GetNil()))
{
XMLTools::XMLElement bottomBorder( L"w:bottom" );
appendBorderAttributes(_brcBottom.get(), &bottomBorder);
addOrSetBorder(_tcBorders, &bottomBorder);
}
if (_brcRight)
if ((_brcRight && _brcRight->GetType() != 0) || (_brcRight && _brcRight->GetNil()))
{
XMLTools::XMLElement rightBorder( L"w:right" );
appendBorderAttributes( _brcRight.get(), &rightBorder );