Commit 65709f9c authored by ElenaSubbotina's avatar ElenaSubbotina

fix bug #35660

parent 66b45dba
......@@ -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
}
......@@ -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
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment