Commit 446e5191 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent fb1fc019
...@@ -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));
}
}
} }
} }
} }
......
...@@ -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_)
......
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