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
4acaa75b
Commit
4acaa75b
authored
Sep 12, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v5.0.0' of
https://github.com/ONLYOFFICE/core
into release/v5.0.0
parents
431115ef
2d66d990
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
15 deletions
+1
-15
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
+1
-15
No files found.
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
View file @
4acaa75b
...
...
@@ -209,21 +209,7 @@ XlsConverter::XlsConverter(const std::wstring & xls_file, const std::wstring & _
XLS
::
BinReaderProcessor
proc
(
pivot_cache_reader
,
pivot_cache
.
get
()
,
true
);
proc
.
mandatory
(
*
pivot_cache
.
get
());
int
index
=
-
1
;
try
{
index
=
boost
::
lexical_cast
<
int
>
(
it
->
c_str
());
}
catch
(...)
{
}
if
(
index
<
0
)
{
//может быть шестнадцатеричное
index
=
XmlUtils
::
GetHex
(
*
it
);
}
if
(
index
<
0
)
index
=
last_index
+
1
;
int
index
=
XmlUtils
::
GetHex
(
*
it
);
xls_global_info
->
mapPivotCacheStream
.
insert
(
std
::
make_pair
(
index
,
pivot_cache
));
...
...
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