Skip to content

O
onlyoffice_core
Commit 43ef04f8 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov
Browse files
Options

изменен порядок записи xlsx node в border и font в соответствии с xsd 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58230 954022d7-b5bf-4e40-9824-e11837661b57
parent 4d5eda89
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
Common/DocxFormat/Source/XlsxFormat/Styles/Borders.h
View file @ 43ef04f8
......@@ -136,10 +136,10 @@ namespace OOX
m_oDiagonal->toXML2(writer, _T("diagonal"));
else
writer.WriteString(_T("<diagonal/>"));
if(m_oHorizontal.IsInit() && false == m_oHorizontal->IsEmpty())
m_oHorizontal->toXML2(writer, _T("horizontal"));
if(m_oVertical.IsInit() && false == m_oVertical->IsEmpty())
m_oVertical->toXML2(writer, _T("vertical"));
if(m_oHorizontal.IsInit() && false == m_oHorizontal->IsEmpty())
m_oHorizontal->toXML2(writer, _T("horizontal"));
writer.WriteString(_T("</border>"));
}
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
......
Common/DocxFormat/Source/XlsxFormat/Styles/Fonts.h
View file @ 43ef04f8
......@@ -29,39 +29,28 @@ namespace OOX
virtual void toXML(XmlUtils::CStringWriter& writer) const
{
writer.WriteString(_T("<font>"));
if(m_oBold.IsInit())
if(m_oRFont.IsInit() && m_oRFont->m_sVal.IsInit())
{
if(SimpleTypes::onoffTrue == m_oBold->m_oVal.GetValue())
writer.WriteString(_T("<b/>"));
else
writer.WriteString(_T("<b val=\"0\"/>"));
}
CString sVal;sVal.Format(_T("<name val=\"%s\"/>"), XmlUtils::EncodeXmlString(m_oRFont->m_sVal.get()));
writer.WriteString(sVal);
}
if(m_oCharset.IsInit() && m_oCharset->m_oCharset.IsInit())
{
CString sVal;sVal.Format(_T("<charset val=\"%s\"/>"), m_oCharset->m_oCharset->ToString());
writer.WriteString(sVal);
}
if(m_oColor.IsInit())
m_oColor->toXML2(writer, _T("color"));
if(m_oCondense.IsInit())
{
if(SimpleTypes::onoffTrue == m_oCondense->m_oVal.GetValue())
writer.WriteString(_T("<condense/>"));
else
writer.WriteString(_T("<condense val=\"0\"/>"));
}
if(m_oExtend.IsInit())
{
if(SimpleTypes::onoffTrue == m_oExtend->m_oVal.GetValue())
writer.WriteString(_T("<extend/>"));
else
writer.WriteString(_T("<extend val=\"0\"/>"));
}
if(m_oFamily.IsInit() && m_oFamily->m_oFontFamily.IsInit())
{
CString sVal;sVal.Format(_T("<family val=\"%s\"/>"), m_oFamily->m_oFontFamily->ToString());
writer.WriteString(sVal);
}
if(m_oBold.IsInit())
{
if(SimpleTypes::onoffTrue == m_oBold->m_oVal.GetValue())
writer.WriteString(_T("<b/>"));
else
writer.WriteString(_T("<b val=\"0\"/>"));
}
if(m_oItalic.IsInit())
{
if(SimpleTypes::onoffTrue == m_oItalic->m_oVal.GetValue())
......@@ -69,6 +58,13 @@ namespace OOX
else
writer.WriteString(_T("<i val=\"0\"/>"));
}
if(m_oStrike.IsInit())
{
if(SimpleTypes::onoffTrue == m_oStrike->m_oVal.GetValue())
writer.WriteString(_T("<strike/>"));
else
writer.WriteString(_T("<strike val=\"0\"/>"));
}
if(m_oOutline.IsInit())
{
if(SimpleTypes::onoffTrue == m_oOutline->m_oVal.GetValue())
......@@ -76,16 +72,6 @@ namespace OOX
else
writer.WriteString(_T("<outline val=\"0\"/>"));
}
if(m_oRFont.IsInit() && m_oRFont->m_sVal.IsInit())
{
CString sVal;sVal.Format(_T("<name val=\"%s\"/>"), XmlUtils::EncodeXmlString(m_oRFont->m_sVal.get()));
writer.WriteString(sVal);
}
if(m_oScheme.IsInit() && m_oScheme->m_oFontScheme.IsInit())
{
CString sVal;sVal.Format(_T("<scheme val=\"%s\"/>"), m_oScheme->m_oFontScheme->ToString());
writer.WriteString(sVal);
}
if(m_oShadow.IsInit())
{
if(SimpleTypes::onoffTrue == m_oShadow->m_oVal.GetValue())
......@@ -93,13 +79,22 @@ namespace OOX
else
writer.WriteString(_T("<shadow val=\"0\"/>"));
}
if(m_oStrike.IsInit())
if(m_oCondense.IsInit())
{
if(SimpleTypes::onoffTrue == m_oStrike->m_oVal.GetValue())
writer.WriteString(_T("<strike/>"));
if(SimpleTypes::onoffTrue == m_oCondense->m_oVal.GetValue())
writer.WriteString(_T("<condense/>"));
else
writer.WriteString(_T("<strike val=\"0\"/>"));
writer.WriteString(_T("<condense val=\"0\"/>"));
}
if(m_oExtend.IsInit())
{
if(SimpleTypes::onoffTrue == m_oExtend->m_oVal.GetValue())
writer.WriteString(_T("<extend/>"));
else
writer.WriteString(_T("<extend val=\"0\"/>"));
}
if(m_oColor.IsInit())
m_oColor->toXML2(writer, _T("color"));
if(m_oSz.IsInit() && m_oSz->m_oVal.IsInit())
{
CString sVal;sVal.Format(_T("<sz val=\"%s\"/>"), SpreadsheetCommon::WriteDouble(m_oSz->m_oVal->GetValue()));
......@@ -119,6 +114,11 @@ namespace OOX
CString sVal;sVal.Format(_T("<vertAlign val=\"%s\"/>"), m_oVertAlign->m_oVerticalAlign->ToString());
writer.WriteString(sVal);
}
if(m_oScheme.IsInit() && m_oScheme->m_oFontScheme.IsInit())
{
CString sVal;sVal.Format(_T("<scheme val=\"%s\"/>"), m_oScheme->m_oFontScheme->ToString());
writer.WriteString(sVal);
}
writer.WriteString(_T("</font>"));
}
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
......
Common/DocxFormat/Source/XlsxFormat/Styles/TableStyles.h
View file @ 43ef04f8
......@@ -95,7 +95,7 @@ namespace OOX
sName.Format(_T(" name=\"%s\""), XmlUtils::EncodeXmlString(m_oName.get2()));
writer.WriteString(sName);
}
if(m_oPivot.IsInit() && true == m_oPivot->ToBool())
if((m_oPivot.IsInit() && true == m_oPivot->ToBool()) || (m_oTable.IsInit() && false == m_oTable->ToBool()))
writer.WriteString(_T(" table=\"0\""));
else
writer.WriteString(_T(" pivot=\"0\""));
......
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