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
c0a061f2
Commit
c0a061f2
authored
Aug 21, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/release/v5.0.0' into develop
parents
65e7372c
0296a6ef
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
14 deletions
+25
-14
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+1
-1
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp
+2
-2
ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
+3
-2
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+1
-2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
+15
-6
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
...iceXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
+3
-1
No files found.
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
c0a061f2
...
...
@@ -3025,7 +3025,7 @@ namespace BinDocxRW
std
::
wstring
&
sShapeType
=
aShapeTypes
[
i
];
pOfficeDrawingConverter
->
AddShapeType
(
sShapeType
);
}
pOfficeDrawingConverter
->
SetRels
(
oldRels
);
pOfficeDrawingConverter
->
SetRels
(
oldRels
);
}
void
WriteVbaProjectContent
(
OOX
::
VbaProject
&
oVbaProject
)
{
...
...
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp
View file @
c0a061f2
...
...
@@ -113,7 +113,7 @@ void calcext_conditional_format::serialize(std::wostream & _Wostream)
{
CP_XML_ATTR_OPT
(
L"calcext:target-range-address"
,
calcext_target_range_address_
);
for
(
size_t
i
=
content_
.
size
()
-
1
;
i
>=
0
;
i
--
)
for
(
int
i
=
(
int
)
content_
.
size
()
-
1
;
i
>=
0
;
i
--
)
{
content_
[
i
]
->
serialize
(
CP_XML_STREAM
());
}
...
...
@@ -269,4 +269,4 @@ void calcext_date_is::serialize(std::wostream & _Wostream)
}
}
}
}
\ No newline at end of file
}
ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
View file @
c0a061f2
...
...
@@ -54,8 +54,9 @@ static int style_family_counts_[26]={};//согласно количеству
void
calc_paragraph_properties_content
(
std
::
vector
<
style_paragraph_properties
*>
&
parProps
,
paragraph_format_properties
*
result
)
{
if
(
result
==
NULL
)
return
;
if
(
parProps
.
empty
())
return
;
for
(
size_t
i
=
parProps
.
size
()
-
1
;
i
>=
0
;
i
--
)
for
(
int
i
=
(
int
)
parProps
.
size
()
-
1
;
i
>=
0
;
i
--
)
{
if
(
parProps
[
i
])
result
->
apply_from
(
parProps
[
i
]
->
content_
);
...
...
@@ -444,4 +445,4 @@ void odf_style_context::calc_paragraph_properties(std::wstring style_name, style
}
}
\ No newline at end of file
}
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
c0a061f2
...
...
@@ -2228,8 +2228,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
std
::
wstring
strPos
=
arSplit
[
i
].
substr
(
0
,
p
);
std
::
wstring
strColor
=
arSplit
[
i
].
substr
(
p
+
1
);
double
pos
;
pos
=
_wtof
(
strPos
.
c_str
());
double
pos
=
strPos
.
empty
()
?
0
:
_wtof
(
strPos
.
c_str
());
NSPresentationEditor
::
CColor
color
=
NS_DWC_Common
::
getColorFromString
(
strColor
);
PPTX
::
Logic
::
UniColor
*
oColor
=
new
PPTX
::
Logic
::
UniColor
();
...
...
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
View file @
c0a061f2
...
...
@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql)
// CP_XML_ATTR(L"containsString", 0);
// }
//}
if
(
bInteger
&&
bNumber
)
{
bInteger
=
false
;
}
if
((
bDate
&
bNumber
)
||
(
bNumber
&
bString
))
{
...
...
@@ -277,8 +273,21 @@ int FDB::serialize(std::wostream & strm, bool bSql)
}
if
(
bEmpty
)
CP_XML_ATTR
(
L"containsBlank"
,
1
);
if
(
bNumber
)
CP_XML_ATTR
(
L"containsNumber"
,
1
);
if
(
bInteger
&&
!
bDate
&
bString
)
CP_XML_ATTR
(
L"containsInteger"
,
1
);
if
(
bNumber
)
CP_XML_ATTR
(
L"containsNumber"
,
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
)
{
...
...
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp
View file @
c0a061f2
...
...
@@ -141,8 +141,9 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
{
case
rt_Uncalced
:
proc
.
optional
<
Uncalced
>
();
break
;
case
rt_Index
:
proc
.
optional
<
Index
>
();
break
;
case
rt_CalcRefMode
:
case
rt_CalcRefMode
:
//todooo сделать вариативно по всем проверку
case
rt_CalcMode
:
case
rt_PrintRowCol
:
{
GLOBALS
globals
(
false
);
if
(
proc
.
mandatory
(
globals
))
...
...
@@ -221,6 +222,7 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
elements_
.
pop_back
();
}
}
break
;
case
rt_LabelSst
:
//order_history.xls
case
rt_Label
:
//file(6).xls
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