x2t - fix same files

paulwang001 · Jan 18, 2019 · 4ec7d3b · 4ec7d3b
1 parent 792a0b3
commit 4ec7d3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Common/DocxFormat/Source/XlsxFormat/Table/Table.h b/Common/DocxFormat/Source/XlsxFormat/Table/Table.h
@@ -198,14 +198,14 @@ namespace OOX
 				{
 					writer.WriteString(L">");
 
-					if(m_oTotalsRowFormula.IsInit())
-					{
-						WritingStringValEncodeXmlString(L"totalsRowFormula", m_oTotalsRowFormula.get());
-					}
 					if(m_oCalculatedColumnFormula.IsInit())
 					{
 						WritingStringValEncodeXmlString(L"calculatedColumnFormula", m_oCalculatedColumnFormula.get());
 					}
+					if(m_oTotalsRowFormula.IsInit())
+					{
+						WritingStringValEncodeXmlString(L"totalsRowFormula", m_oTotalsRowFormula.get());
+					}
 
 					writer.WriteString(L"</tableColumn>");
 				}

diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.h b/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.h
@@ -439,7 +439,7 @@ namespace OOX
 					WritingStringNullableAttrInt(L"stdDev", m_oStdDev, m_oStdDev->GetValue());
 					if (m_oStopIfTrue.IsInit() && true == m_oStopIfTrue->ToBool())
 						writer.WriteString(_T (" stopIfTrue=\"1\""));
-					WritingStringNullableAttrString(L"text", m_oText, m_oText.get());
+					WritingStringNullableAttrEncodeXmlString(L"text", m_oText, m_oText.get());
 					WritingStringNullableAttrString(L"timePeriod", m_oTimePeriod, m_oTimePeriod.get());
 
 					writer.WriteString(_T(">"));