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
dcee1127
Commit
dcee1127
authored
Aug 21, 2017
by
ElenaSubbotina
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
65709f9c
bf5c41b9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
...iceXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
+3
-1
No files found.
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
View file @
dcee1127
...
@@ -141,8 +141,9 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
...
@@ -141,8 +141,9 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
{
{
case
rt_Uncalced
:
proc
.
optional
<
Uncalced
>
();
break
;
case
rt_Uncalced
:
proc
.
optional
<
Uncalced
>
();
break
;
case
rt_Index
:
proc
.
optional
<
Index
>
();
break
;
case
rt_Index
:
proc
.
optional
<
Index
>
();
break
;
case
rt_CalcRefMode
:
case
rt_CalcRefMode
:
//todooo сделать вариативно по всем проверку
case
rt_CalcMode
:
case
rt_CalcMode
:
case
rt_PrintRowCol
:
{
{
GLOBALS
globals
(
false
);
GLOBALS
globals
(
false
);
if
(
proc
.
mandatory
(
globals
))
if
(
proc
.
mandatory
(
globals
))
...
@@ -221,6 +222,7 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
...
@@ -221,6 +222,7 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
elements_
.
pop_back
();
elements_
.
pop_back
();
}
}
}
break
;
}
break
;
case
rt_LabelSst
:
//order_history.xls
case
rt_Label
:
//file(6).xls
case
rt_Label
:
//file(6).xls
case
rt_Row
:
case
rt_Row
:
{
{
...
...
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