Skip to content

O
onlyoffice_core
Commit 11cdf250 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

bug #31949 

//конфликтная ситуация

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68906 954022d7-b5bf-4e40-9824-e11837661b57
parent 18f3cf18
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 210 deletions
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ 11cdf250
...@@ -88,8 +88,7 @@ namespace BinDocxRW ...@@ -88,8 +88,7 @@ namespace BinDocxRW
} }
void WriteBorder(const BYTE & type, const ComplexTypes::Word::CBorder& border) void WriteBorder(const BYTE & type, const ComplexTypes::Word::CBorder& border)
{ {
if ((border.m_oVal.IsInit()) && (border.m_oVal->GetValue() == SimpleTypes::bordervalueNone)) return; //if ((border.m_oVal.IsInit()) && (border.m_oVal->GetValue() == SimpleTypes::bordervalueNone)) return;
int nCurPos = WriteItemStart(type); int nCurPos = WriteItemStart(type);
WriteBorder(border); WriteBorder(border);
WriteItemEnd(nCurPos); WriteItemEnd(nCurPos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7