Commit 1aa0b039 authored by ElenaSubbotina's avatar ElenaSubbotina

XlsFormat - fix pivots after testing

parent e2ada4ca
...@@ -193,12 +193,15 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -193,12 +193,15 @@ int PIVOTVIEW::serialize(std::wostream & strm)
core->m_PIVOTPI->serialize(CP_XML_STREAM()); core->m_PIVOTPI->serialize(CP_XML_STREAM());
} }
} }
CP_XML_NODE(L"dataFields") if (core->m_arSXDI.empty() == false)
{ {
CP_XML_ATTR(L"count", view->cDimData); CP_XML_NODE(L"dataFields")
for (size_t i = 0; i < core->m_arSXDI.size(); i++)
{ {
core->m_arSXDI[i]->serialize(CP_XML_STREAM()); CP_XML_ATTR(L"count", view->cDimData);
for (size_t i = 0; i < core->m_arSXDI.size(); i++)
{
core->m_arSXDI[i]->serialize(CP_XML_STREAM());
}
} }
} }
//CP_XML_NODE(L"pivotTableStyleInfo") //CP_XML_NODE(L"pivotTableStyleInfo")
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include "../Biff_records/SXString.h" #include "../Biff_records/SXString.h"
#include "../Biff_records/SXDtr.h" #include "../Biff_records/SXDtr.h"
#include <boost/lexical_cast.hpp>
namespace XLS namespace XLS
{ {
...@@ -85,7 +87,7 @@ const bool SXOPER::loadContent(BinProcessor& proc) ...@@ -85,7 +87,7 @@ const bool SXOPER::loadContent(BinProcessor& proc)
if (bInteger) if (bInteger)
value = std::to_wstring((int)num->num.data.value); value = std::to_wstring((int)num->num.data.value);
else else
value = std::to_wstring(num->num.data.value); value = boost::lexical_cast<std::wstring>(num->num.data.value);
} }
else if(proc.optional<SxBool>()) else if(proc.optional<SxBool>())
{ {
......
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