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
0296a6ef
Commit
0296a6ef
authored
Aug 21, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #35681
parent
dcee1127
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
+15
-6
No files found.
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
View file @
0296a6ef
...
@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql)
...
@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql)
// CP_XML_ATTR(L"containsString", 0);
// CP_XML_ATTR(L"containsString", 0);
// }
// }
//}
//}
if
(
bInteger
&&
bNumber
)
{
bInteger
=
false
;
}
if
((
bDate
&
bNumber
)
||
(
bNumber
&
bString
))
if
((
bDate
&
bNumber
)
||
(
bNumber
&
bString
))
{
{
...
@@ -278,7 +274,20 @@ int FDB::serialize(std::wostream & strm, bool bSql)
...
@@ -278,7 +274,20 @@ int FDB::serialize(std::wostream & strm, bool bSql)
if
(
bEmpty
)
CP_XML_ATTR
(
L"containsBlank"
,
1
);
if
(
bEmpty
)
CP_XML_ATTR
(
L"containsBlank"
,
1
);
if
(
bNumber
)
CP_XML_ATTR
(
L"containsNumber"
,
1
);
if
(
bNumber
)
CP_XML_ATTR
(
L"containsNumber"
,
1
);
if
(
bInteger
&&
!
bDate
&
bString
)
CP_XML_ATTR
(
L"containsInteger"
,
1
);
if
(
bInteger
&&
!
bDate
)
{
if
(
bString
)
{
CP_XML_ATTR
(
L"containsInteger"
,
1
);
}
else
if
(
!
bNumber
)
{
CP_XML_ATTR
(
L"containsNumber"
,
1
);
CP_XML_ATTR
(
L"containsInteger"
,
1
);
}
}
if
(
fdb
->
fnumMinMaxValid
)
if
(
fdb
->
fnumMinMaxValid
)
{
{
...
...
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