pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

o:allowincell -> layoutInCell

Browse Source
This commit is contained in:
Oleg Korshul
2016-08-26 18:15:52 +03:00
parent d2b7608986
commit c18d5a8246
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View File

@ -2989,6 +2989,17 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
*/
}
nullable_bool isAllowInCell;
nullable_string sAllowInCell;
oNode.ReadAttributeBase(L"o:allowincell", sAllowInCell);
if (sAllowInCell.is_init())
{
if ((L"f" == *sAllowInCell) || (L"false"== *sAllowInCell))
isAllowInCell = false;
if ((L"t" == *sAllowInCell) || (L"true"== *sAllowInCell))
isAllowInCell = true;
}
CString strWrapPoints = oNode.GetAttribute(_T("wrapcoords"));
CString strWrapPointsResult = _T("");
if (_T("") != strWrapPoints)
@ -3029,6 +3040,14 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
}
}
if (isAllowInCell.is_init())
{
if (*isAllowInCell)
oWriter.WriteAttribute(_T("layoutInCell"), (CString)_T("1"));
else
oWriter.WriteAttribute(_T("layoutInCell"), (CString)_T("0"));
}
oWriter.EndAttributes();
oWriter.StartNode(_T("wp:positionH"));

7
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h
View File

@ -36,6 +36,13 @@
#include "../../../Attributes.h"
#include "Formula.h"
#ifdef max
#undef max
#endif
#ifdef min
#undef min
#endif
namespace NSCustomVML
{
using namespace NSPresentationEditor;