Commit f4d16b0d authored by ElenaSubbotina's avatar ElenaSubbotina

Merge remote-tracking branch 'origin/release/v4.4.1' into develop

parents 69b4a094 398dc42b
...@@ -235,7 +235,7 @@ void Compute_HatchFill(draw_hatch * image_style,oox::oox_hatch_fill_ptr fill) ...@@ -235,7 +235,7 @@ void Compute_HatchFill(draw_hatch * image_style,oox::oox_hatch_fill_ptr fill)
int style =0; int style =0;
if (image_style->draw_style_)style = image_style->draw_style_->get_type(); if (image_style->draw_style_)style = image_style->draw_style_->get_type();
int angle = (int)(0.5 + *image_style->draw_rotation_/10.); int angle = image_style->draw_rotation_ ? (int)(0.5 + *image_style->draw_rotation_/10.) : 0;
if (image_style->draw_color_)fill->color_ref = image_style->draw_color_->get_hex_value(); if (image_style->draw_color_)fill->color_ref = image_style->draw_color_->get_hex_value();
......
...@@ -626,6 +626,7 @@ public: ...@@ -626,6 +626,7 @@ public:
// header_footer_content_impl content_; // header_footer_content_impl content_;
}; };
CP_REGISTER_OFFICE_ELEMENT2(style_footer_first);
/// style:header-left /// style:header-left
class style_header_left : public office_element_impl<style_header_left>, public header_footer_impl class style_header_left : public office_element_impl<style_header_left>, public header_footer_impl
......
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