Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
1aa0b039
Commit
1aa0b039
authored
Jul 21, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XlsFormat - fix pivots after testing
parent
e2ada4ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp
...XlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp
+7
-4
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.cpp
...iceXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.cpp
+3
-1
No files found.
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp
View file @
1aa0b039
...
@@ -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")
...
...
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.cpp
View file @
1aa0b039
...
@@ -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
>
())
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment