Commit 5f9631a3 authored by ElenaSubbotina's avatar ElenaSubbotina

..

parent ef7df690
...@@ -134,11 +134,11 @@ namespace PPTX ...@@ -134,11 +134,11 @@ namespace PPTX
virtual std::wstring GetODString()const virtual std::wstring GetODString()const
{ {
std::wstring str = L"<pt x=\"" + x + L"\" y=\"" + y + L"\" />"; std::wstring str = L"<pt x=\"" + x + L"\" y=\"" + y + L"\" />";
return _T("<lnTo>") + str + _T("</lnTo>"); return _T("<lnTo>") + str + _T("</lnTo>");
} }
}; };
} // namespace Logic } // namespace Logic
} // namespace PPTX } // namespace PPTX
#endif // PPTX_LOGIC_LINETO_INCLUDE_H_ #endif // PPTX_LOGIC_LINETO_INCLUDE_H_
\ No newline at end of file
...@@ -132,7 +132,7 @@ namespace PPTX ...@@ -132,7 +132,7 @@ namespace PPTX
public: public:
virtual std::wstring GetODString()const virtual std::wstring GetODString()const
{ {
std::wstring str = L"<pt x=\"" + x + L"\" y=\"" + y + L"\" />"; std::wstring str = L"<pt x=\"" + x + L"\" y=\"" + y + L"\" />";
return _T("<moveTo>") + str + _T("</moveTo>"); return _T("<moveTo>") + str + _T("</moveTo>");
} }
}; };
......
...@@ -161,8 +161,8 @@ namespace PPTX ...@@ -161,8 +161,8 @@ namespace PPTX
virtual std::wstring GetODString()const virtual std::wstring GetODString()const
{ {
std::wstring str1 = L"<pt x=\"" + x[0] + L"\" y=\"" + y[0] + L"\" />"; std::wstring str1 = L"<pt x=\"" + x[0] + L"\" y=\"" + y[0] + L"\" />";
std::wstring str2 = L"<pt x=\"" + x[1] + L"\" y=\"" + y[1] + L"\" />"; std::wstring str2 = L"<pt x=\"" + x[1] + L"\" y=\"" + y[1] + L"\" />";
return _T("<quadBezTo>") + str1 + str2 + _T("</quadBezTo>"); return _T("<quadBezTo>") + str1 + str2 + _T("</quadBezTo>");
} }
...@@ -170,4 +170,4 @@ namespace PPTX ...@@ -170,4 +170,4 @@ namespace PPTX
} // namespace Logic } // namespace Logic
} // namespace PPTX } // namespace PPTX
#endif // PPTX_LOGIC_QUADBEZTO_INCLUDE_H_ #endif // PPTX_LOGIC_QUADBEZTO_INCLUDE_H_
\ No newline at end of file
...@@ -298,7 +298,7 @@ namespace PPTX ...@@ -298,7 +298,7 @@ namespace PPTX
SpTreeElem elm; SpTreeElem elm;
elm.fromPPTY(pReader); elm.fromPPTY(pReader);
if (SpTreeElems.back().is_init()) if (elm.is_init())
{ {
if (elm.getType() == OOX::et_p_ShapeTree) if (elm.getType() == OOX::et_p_ShapeTree)
{ {
......
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