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
446e5191
Commit
446e5191
authored
May 02, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
fb1fc019
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
+12
-4
ASCOfficeOdfFile/src/odf/style_text_properties.cpp
ASCOfficeOdfFile/src/odf/style_text_properties.cpp
+6
-2
No files found.
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
View file @
446e5191
...
@@ -167,15 +167,23 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
...
@@ -167,15 +167,23 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
{
{
if
(
fill
!=
L"a:noFill"
)
if
(
fill
!=
L"a:noFill"
)
{
{
if
(
color
.
length
()
<
1
&&
always_draw
)
color
=
L"000000"
;
if
(
color
.
empty
()
)
else
if
(
color
.
length
()
<
1
)
color
=
L"ffffff"
;
{
if
(
always_draw
)
color
=
L"000000"
;
else
color
=
L"ffffff"
;
}
CP_XML_NODE
(
L"a:srgbClr"
)
CP_XML_NODE
(
L"a:srgbClr"
)
{
{
CP_XML_ATTR
(
L"val"
,
color
);
CP_XML_ATTR
(
L"val"
,
color
);
if
(
dStrokeOpacity
)
CP_XML_NODE
(
L"a:alpha"
){
CP_XML_ATTR
(
L"val"
,
*
dStrokeOpacity
);}
if
(
dStrokeOpacity
)
{
CP_XML_NODE
(
L"a:alpha"
)
{
CP_XML_ATTR
(
L"val"
,
(
int
)(
*
dStrokeOpacity
*
1000
));
}
}
}
}
}
}
}
}
...
...
ASCOfficeOdfFile/src/odf/style_text_properties.cpp
View file @
446e5191
...
@@ -462,10 +462,14 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
...
@@ -462,10 +462,14 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
}
}
//nodes
//nodes
if
(
fo_color_
)
if
(
fo_color_
)
{
std
::
wstring
strRGB
=
fo_color_
->
get_hex_value
();
//auto ... не нужно
if
(
!
strRGB
.
empty
())
{
{
CP_XML_NODE
(
L"a:solidFill"
)
CP_XML_NODE
(
L"a:solidFill"
)
{
{
CP_XML_NODE
(
L"a:srgbClr"
)
{
CP_XML_ATTR
(
L"val"
,
fo_color_
->
get_hex_value
());}
CP_XML_NODE
(
L"a:srgbClr"
)
{
CP_XML_ATTR
(
L"val"
,
strRGB
);}
}
}
}
}
}
if
(
style_font_name_
||
style_font_name_asian_
||
style_font_name_complex_
||
fo_font_family_
)
if
(
style_font_name_
||
style_font_name_asian_
||
style_font_name_complex_
||
fo_font_family_
)
...
...
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