Skip to content

O
onlyoffice_core
Commit 884b0eb5 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

PptFormatReader - bug #31885 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68840 954022d7-b5bf-4e40-9824-e11837661b57
parent 7ebd343f
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 59 deletions
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
View file @ 884b0eb5
...@@ -670,73 +670,70 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo() ...@@ -670,73 +670,70 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
m_oWriter.WriteString(std::wstring(L"<a:bodyPr" )); m_oWriter.WriteString(std::wstring(L"<a:bodyPr" ));
// int __l = (int)((m_oBounds.left + m_oTextRect.left) * EMU_MM); int __l = (int)((- m_oBounds.left + m_oTextRect.left )* EMU_MM);
//int __t = (int)((m_oBounds.top + m_oTextRect.top) * EMU_MM); int __t = (int)((- m_oBounds.top + m_oTextRect.top )* EMU_MM);
//int __r = (int)((m_oBounds.right - m_oTextRect.right)* EMU_MM); int __r = (int)(( m_oBounds.right - m_oTextRect.right )* EMU_MM);
//int __b = (int)((m_oBounds.bottom - m_oTextRect.bottom)* EMU_MM); int __b = (int)(( m_oBounds.bottom - m_oTextRect.bottom)* EMU_MM);
CString str;
str.Format(L" lIns=\"%d\" tIns=\"%d\" rIns=\"%d\" bIns=\"%d\"",__l, __t, __r, __b);
m_oWriter.WriteString(str);
// m_oWriter.WriteString(std::wstring(L" lIns=\"0\" tIns=\"0\" rIns=\"0\" bIns=\"0\""));
//if (true) if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 0 )
//{ m_oWriter.WriteString(" anchor=\"t\"");
// CString str; else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 2 )
// str.Format(L" lIns=\"%d\" tIns=\"%d\" rIns=\"%d\" bIns=\"%d\"",__l, __t, __r, __b); m_oWriter.WriteString(" anchor=\"b\"");
// m_oWriter.WriteString(str); else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 1 )
//} {
//else m_oWriter.WriteString(" anchor=\"ctr\"");
m_oWriter.WriteString(std::wstring(L" lIns=\"0\" tIns=\"0\" rIns=\"0\" bIns=\"0\"")); m_oWriter.WriteString(" anchorCtr=\"0\"");
}
if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 0 ) if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate > 0)
m_oWriter.WriteString(" anchor=\"t\""); {
else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 2 ) CString strProp;
m_oWriter.WriteString(" anchor=\"b\""); strProp.Format(_T(" rot=\"%d\""), (int)(m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate * 60000));
else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 1 ) m_oWriter.WriteString(strProp);
{ }
m_oWriter.WriteString(" anchor=\"ctr\""); if (m_pShapeElement->m_oShape.m_oText.m_bVertical)
m_oWriter.WriteString(" anchorCtr=\"0\""); {
} m_oWriter.WriteString(" vert=\"eaVert\"");
if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate > 0) }
{ m_oWriter.WriteString(std::wstring(L">"));
CString strProp;
strProp.Format(_T(" rot=\"%d\""), (int)(m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate * 60000));
m_oWriter.WriteString(strProp);
}
if (m_pShapeElement->m_oShape.m_oText.m_bVertical)
{
m_oWriter.WriteString(" vert=\"eaVert\"");
}
m_oWriter.WriteString(std::wstring(L">"));
if (m_bWordArt) if (m_bWordArt)
{ {
std::wstring prstTxWarp = oox::Spt2WordArtShapeType((oox::MSOSPT)m_pShapeElement->m_lShapeType); std::wstring prstTxWarp = oox::Spt2WordArtShapeType((oox::MSOSPT)m_pShapeElement->m_lShapeType);
m_oWriter.WriteString(std::wstring(L"<a:prstTxWarp")); m_oWriter.WriteString(std::wstring(L"<a:prstTxWarp"));
m_oWriter.WriteString(std::wstring(L" prst=\"") + prstTxWarp + _T("\">")); m_oWriter.WriteString(std::wstring(L" prst=\"") + prstTxWarp + _T("\">"));
m_oWriter.WriteString(std::wstring(L"<a:avLst>"));// m_oWriter.WriteString(std::wstring(L"<a:avLst>"));//
CPPTShape *pPPTShape = dynamic_cast<CPPTShape *>(m_pShapeElement->m_oShape.m_pShape); CPPTShape *pPPTShape = dynamic_cast<CPPTShape *>(m_pShapeElement->m_oShape.m_pShape);
CString strVal; CString strVal;
for (int i = 0 ; (pPPTShape) && (i < pPPTShape->m_arAdjustments.size()); i++) for (int i = 0 ; (pPPTShape) && (i < pPPTShape->m_arAdjustments.size()); i++)
{
switch(m_pShapeElement->m_lShapeType)
{ {
switch(m_pShapeElement->m_lShapeType) case oox::msosptTextFadeUp:
{ {
case oox::msosptTextFadeUp: double kf = 4.63; //""
{ strVal.Format(L"%d", (int)(kf * pPPTShape->m_arAdjustments[i]));
double kf = 4.63; //"" m_oWriter.WriteString(std::wstring(L"<a:gd name=\"adj\" fmla=\"val "));
strVal.Format(L"%d", (int)(kf * pPPTShape->m_arAdjustments[i])); m_oWriter.WriteString(strVal + _T("\"/>"));
m_oWriter.WriteString(std::wstring(L"<a:gd name=\"adj\" fmla=\"val ")); }break;
m_oWriter.WriteString(strVal + _T("\"/>"));
}break;
}
} }
}
m_oWriter.WriteString(std::wstring(L"</a:avLst>")); m_oWriter.WriteString(std::wstring(L"</a:avLst>"));
m_oWriter.WriteString(std::wstring(L"</a:prstTxWarp>")); m_oWriter.WriteString(std::wstring(L"</a:prstTxWarp>"));
} }
if (m_pShapeElement->m_oShape.m_oText.m_bAutoFit) if (m_pShapeElement->m_oShape.m_oText.m_bAutoFit)
{ {
m_oWriter.WriteString(std::wstring(L"<a:spAutoFit/>")); m_oWriter.WriteString(std::wstring(L"<a:spAutoFit/>"));
} }
m_oWriter.WriteString(std::wstring(L"</a:bodyPr>")); m_oWriter.WriteString(std::wstring(L"</a:bodyPr>"));
if (0 == nCount) if (0 == nCount)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7