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
65709f9c
Commit
65709f9c
authored
Aug 21, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #35660
parent
66b45dba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
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
No files found.
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp
View file @
65709f9c
...
@@ -113,7 +113,7 @@ void calcext_conditional_format::serialize(std::wostream & _Wostream)
...
@@ -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_
);
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
());
content_
[
i
]
->
serialize
(
CP_XML_STREAM
());
}
}
...
@@ -269,4 +269,4 @@ void calcext_date_is::serialize(std::wostream & _Wostream)
...
@@ -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 @
65709f9c
...
@@ -54,8 +54,9 @@ static int style_family_counts_[26]={};//согласно количеству
...
@@ -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
)
void
calc_paragraph_properties_content
(
std
::
vector
<
style_paragraph_properties
*>
&
parProps
,
paragraph_format_properties
*
result
)
{
{
if
(
result
==
NULL
)
return
;
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
])
if
(
parProps
[
i
])
result
->
apply_from
(
parProps
[
i
]
->
content_
);
result
->
apply_from
(
parProps
[
i
]
->
content_
);
...
@@ -444,4 +445,4 @@ void odf_style_context::calc_paragraph_properties(std::wstring style_name, style
...
@@ -444,4 +445,4 @@ void odf_style_context::calc_paragraph_properties(std::wstring style_name, style
}
}
}
}
\ No newline at end of file
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