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
eda8e4d1
Commit
eda8e4d1
authored
Nov 30, 2017
by
Sergey Konovalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add c_oSerCellTypes::ValueText for cell value; Read1 error with empty length
parent
64f578e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
XlsxSerializerCom/Common/BinReaderWriterDefines.h
XlsxSerializerCom/Common/BinReaderWriterDefines.h
+2
-1
XlsxSerializerCom/Writer/BinaryCommonReader.h
XlsxSerializerCom/Writer/BinaryCommonReader.h
+1
-1
XlsxSerializerCom/Writer/BinaryReader.h
XlsxSerializerCom/Writer/BinaryReader.h
+5
-0
No files found.
XlsxSerializerCom/Common/BinReaderWriterDefines.h
View file @
eda8e4d1
...
@@ -298,7 +298,8 @@ namespace BinXlsxRW
...
@@ -298,7 +298,8 @@ namespace BinXlsxRW
Type
=
2
,
Type
=
2
,
Value
=
3
,
Value
=
3
,
Formula
=
4
,
Formula
=
4
,
RefRowCol
=
5
RefRowCol
=
5
,
ValueText
=
6
};}
};}
namespace
c_oSerFormulaTypes
{
enum
c_oSerFormulaTypes
namespace
c_oSerFormulaTypes
{
enum
c_oSerFormulaTypes
{
{
...
...
XlsxSerializerCom/Writer/BinaryCommonReader.h
View file @
eda8e4d1
...
@@ -79,7 +79,7 @@ namespace BinXlsxRW {
...
@@ -79,7 +79,7 @@ namespace BinXlsxRW {
return
c_oSerConstants
::
ReadOk
;
return
c_oSerConstants
::
ReadOk
;
}
}
res
=
(((
CallbackType
*
)
poFuncObj
)
->*
fReadFunction
)(
type
,
length
,
arg
);
res
=
(((
CallbackType
*
)
poFuncObj
)
->*
fReadFunction
)(
type
,
length
,
arg
);
if
(
res
==
c_oSerConstants
::
ReadUnknown
&&
length
>
0
)
if
(
res
==
c_oSerConstants
::
ReadUnknown
)
{
{
m_oBufferedStream
.
GetPointer
(
length
);
m_oBufferedStream
.
GetPointer
(
length
);
res
=
c_oSerConstants
::
ReadOk
;
res
=
c_oSerConstants
::
ReadOk
;
...
...
XlsxSerializerCom/Writer/BinaryReader.h
View file @
eda8e4d1
...
@@ -3555,6 +3555,11 @@ namespace BinXlsxRW {
...
@@ -3555,6 +3555,11 @@ namespace BinXlsxRW {
pCell
->
m_oValue
.
Init
();
pCell
->
m_oValue
.
Init
();
pCell
->
m_oValue
->
m_sText
.
append
(
OOX
::
Spreadsheet
::
SpreadsheetCommon
::
WriteDouble
(
dValue
));
pCell
->
m_oValue
->
m_sText
.
append
(
OOX
::
Spreadsheet
::
SpreadsheetCommon
::
WriteDouble
(
dValue
));
}
}
else
if
(
c_oSerCellTypes
::
ValueText
==
type
)
{
pCell
->
m_oValue
.
Init
();
pCell
->
m_oValue
->
m_sText
.
append
(
m_oBufferedStream
.
GetString4
(
length
));
}
else
else
res
=
c_oSerConstants
::
ReadUnknown
;
res
=
c_oSerConstants
::
ReadUnknown
;
return
res
;
return
res
;
...
...
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