Commit fe1d4863 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent db202320
...@@ -426,7 +426,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm) ...@@ -426,7 +426,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
} }
} }
void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & name_space) void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & name_space, bool always_position)
{ {
CP_XML_WRITER(strm) CP_XML_WRITER(strm)
{ {
...@@ -470,16 +470,16 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam ...@@ -470,16 +470,16 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam
CP_XML_NODE(L"a:off") CP_XML_NODE(L"a:off")
{ {
//if (inGroup) if (inGroup || always_position)
{ {
CP_XML_ATTR(L"x", x); CP_XML_ATTR(L"x", x);
CP_XML_ATTR(L"y", y); CP_XML_ATTR(L"y", y);
} }
//else else
//{ {
// CP_XML_ATTR(L"x", 0); CP_XML_ATTR(L"x", 0);
// CP_XML_ATTR(L"y", 0); CP_XML_ATTR(L"y", 0);
//} }
} }
if (cx > 0 || cy > 0) if (cx > 0 || cy > 0)
......
...@@ -81,7 +81,7 @@ namespace oox { ...@@ -81,7 +81,7 @@ namespace oox {
virtual void serialize (std::wostream & strm) = 0; virtual void serialize (std::wostream & strm) = 0;
void serialize_shape (std::wostream & strm); void serialize_shape (std::wostream & strm);
void serialize_xfrm (std::wostream & strm, const std::wstring & namespace_ = L"a"); void serialize_xfrm (std::wostream & strm, const std::wstring & namespace_ = L"a", bool always_position = false);
void serialize_bodyPr (std::wostream & strm, const std::wstring & namespace_ = L"a"); void serialize_bodyPr (std::wostream & strm, const std::wstring & namespace_ = L"a");
}; };
......
...@@ -107,7 +107,7 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val) ...@@ -107,7 +107,7 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE(L"p:spPr") CP_XML_NODE(L"p:spPr")
{ {
val.serialize_xfrm(CP_XML_STREAM()); val.serialize_xfrm(CP_XML_STREAM(), L"a", true);
CP_XML_NODE(L"a:prstGeom") CP_XML_NODE(L"a:prstGeom")
{ {
...@@ -170,7 +170,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val) ...@@ -170,7 +170,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
if (!bNoRect) if (!bNoRect)
{ {
val.serialize_xfrm(CP_XML_STREAM()); val.serialize_xfrm(CP_XML_STREAM(), L"a", true);
val.serialize_shape(CP_XML_STREAM()); val.serialize_shape(CP_XML_STREAM());
oox_serialize_ln(CP_XML_STREAM(), val.additional); oox_serialize_ln(CP_XML_STREAM(), val.additional);
...@@ -198,7 +198,7 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val) ...@@ -198,7 +198,7 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE(L"p:cNvGraphicFramePr"); CP_XML_NODE(L"p:cNvGraphicFramePr");
CP_XML_NODE(L"p:nvPr"); CP_XML_NODE(L"p:nvPr");
} }
val.serialize_xfrm(CP_XML_STREAM(), L"p"); val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
//oox_serialize_ln(CP_XML_STREAM(),val.additional); //oox_serialize_ln(CP_XML_STREAM(),val.additional);
...@@ -235,7 +235,7 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val) ...@@ -235,7 +235,7 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE(L"p:cNvGraphicFramePr"); CP_XML_NODE(L"p:cNvGraphicFramePr");
CP_XML_NODE(L"p:nvPr"); CP_XML_NODE(L"p:nvPr");
} }
val.serialize_xfrm(CP_XML_STREAM(), L"p"); val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
//oox_serialize_ln(CP_XML_STREAM(),val.additional); //oox_serialize_ln(CP_XML_STREAM(),val.additional);
...@@ -276,7 +276,7 @@ void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val) ...@@ -276,7 +276,7 @@ void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
CP_XML_NODE(L"p:cNvGraphicFramePr"); CP_XML_NODE(L"p:cNvGraphicFramePr");
CP_XML_NODE(L"p:nvPr"); CP_XML_NODE(L"p:nvPr");
} }
val.serialize_xfrm(CP_XML_STREAM(), L"p"); val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
//oox_serialize_ln(CP_XML_STREAM(),val.additional); //oox_serialize_ln(CP_XML_STREAM(),val.additional);
......
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