Commit 62d03d5e authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander Trofimov

поправлено съезжание расположения текста в автофигуре при конвертации doc->docx

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64088 954022d7-b5bf-4e40-9824-e11837661b57
parent 3c6771a9
......@@ -455,6 +455,7 @@ public:
m_strPathLimoX = ((CPPTShape*)Shape)->m_strPathLimoX;
m_strPathLimoY = ((CPPTShape*)Shape)->m_strPathLimoY;
m_arStringTextRects.clear();
m_arStringTextRects.insert(m_arStringTextRects.end(), ((CPPTShape*)Shape)->m_arStringTextRects.begin(), ((CPPTShape*)Shape)->m_arStringTextRects.end());
return CBaseShape::SetProperties(Shape);
......@@ -476,6 +477,7 @@ public:
((CPPTShape*)Shape)->m_strPathLimoX = m_strPathLimoX;
((CPPTShape*)Shape)->m_strPathLimoY = m_strPathLimoY;
((CPPTShape*)Shape)->m_arStringTextRects.clear();
((CPPTShape*)Shape)->m_arStringTextRects.insert(((CPPTShape*)Shape)->m_arStringTextRects.end(), m_arStringTextRects.begin(), m_arStringTextRects.end());
return CBaseShape::SetToDublicate(Shape);
......@@ -542,6 +544,14 @@ public:
dPercentBottom = (double)(lHeight - lBottom) / lHeight;
}
bool IsWordArt()
{
if (m_eType >= PPTShapes::ShapeType::sptCTextPlain && m_eType <= PPTShapes::ShapeType::sptCTextCanDown)
return true;
else
return false;
}
protected:
bool GetPos(CString str, LONG& lValue)
......
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