Commit 04fa312b authored by Oleg Korshul's avatar Oleg Korshul Committed by Alexander Trofimov

добавил комментарий как надо работать с шейпом CONFIDENTIAL в известном документе

parent 4d5b9503
...@@ -1682,6 +1682,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo ...@@ -1682,6 +1682,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
if (!pShape->TextBoxBodyPr.is_init()) if (!pShape->TextBoxBodyPr.is_init())
pShape->TextBoxBodyPr = new PPTX::Logic::BodyPr(); pShape->TextBoxBodyPr = new PPTX::Logic::BodyPr();
bool bIsTrimTextPath = false;
if (pPPTShape->IsWordArt()) if (pPPTShape->IsWordArt())
{ {
enum EFilltype enum EFilltype
...@@ -1854,6 +1856,20 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo ...@@ -1854,6 +1856,20 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
{ {
nFontSize = 2; nFontSize = 2;
} }
nullable_string sFitShape;
oNodeP.ReadAttributeBase(L"fitshape", sFitShape);
if (sFitShape.is_init() && (*sFitShape == _T("true") || *sFitShape == _T("t")))
{
nFontSize = 2;
}
nullable_string sTrim;
oNodeP.ReadAttributeBase(L"trim", sTrim);
if (sTrim.is_init() && (*sTrim == _T("true") || *sTrim == _T("t")))
{
bIsTrimTextPath = true;
}
} }
} }
...@@ -2216,6 +2232,13 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo ...@@ -2216,6 +2232,13 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
pShape->TextBoxBodyPr->tIns = 0; pShape->TextBoxBodyPr->tIns = 0;
pShape->TextBoxBodyPr->rIns = 0; pShape->TextBoxBodyPr->rIns = 0;
pShape->TextBoxBodyPr->bIns = 0; pShape->TextBoxBodyPr->bIns = 0;
if (!bIsTrimTextPath)
{
// нужно для данного размера шейпа выставить отступы сверху и снизу
// top: Ascent - CapHeight
// bottom: Descent
}
} }
else else
{ {
......
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