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
f4d16b0d
Commit
f4d16b0d
authored
Jun 28, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/release/v4.4.1' into develop
parents
69b4a094
398dc42b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ASCOfficeOdfFile/src/odf/draw_common.cpp
ASCOfficeOdfFile/src/odf/draw_common.cpp
+1
-1
ASCOfficeOdfFile/src/odf/styles.h
ASCOfficeOdfFile/src/odf/styles.h
+1
-0
No files found.
ASCOfficeOdfFile/src/odf/draw_common.cpp
View file @
f4d16b0d
...
@@ -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
();
...
...
ASCOfficeOdfFile/src/odf/styles.h
View file @
f4d16b0d
...
@@ -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
...
...
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