Commit ec5f2b82 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

x2t version 2.0.2.345 OOX - внешние vml object - настройки вращения текста в шейпах

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67819 954022d7-b5bf-4e40-9824-e11837661b57
parent 5d14eb88
......@@ -2127,7 +2127,7 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
}
if (!sTextboxStyle.IsEmpty())
{
{//todooo прописать все остальное
PPTX::CCSS oCSSParser;
oCSSParser.LoadFromString2(sTextboxStyle);
......@@ -2152,7 +2152,25 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
if (pShape->TextBoxBodyPr->vert.IsInit() == false)
pShape->TextBoxBodyPr->vert = new PPTX::Limit::TextVerticalType();
pShape->TextBoxBodyPr->vert->set(L"vert270");
}
}
}
if (pShape->TextBoxBodyPr->vert.IsInit())
{
if (pShape->txBody.IsInit() == false)
pShape->txBody = new PPTX::Logic::TxBody();
pShape->txBody->bodyPr.vert = pShape->TextBoxBodyPr->vert;
}
pPair = oCSSParser.m_mapSettings.find(_T("mso-rotate"));
if (pPair != oCSSParser.m_mapSettings.end())
{
try
{
pShape->TextBoxBodyPr->rot = _wtoi(pPair->second) * 60000; //для docx, xlsx
if (pShape->txBody.IsInit() == false) //для pptx
pShape->txBody = new PPTX::Logic::TxBody();
pShape->txBody->bodyPr.rot = pShape->TextBoxBodyPr->rot;
}catch(...){}
}
}
......
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