Commit 14ae4e6f authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57356 954022d7-b5bf-4e40-9824-e11837661b57
parent e11b50bb
...@@ -1050,11 +1050,6 @@ PPTX::Logic::SpTreeElem CAVSOfficeDrawingConverter::doc_LoadShape(XmlUtils::CXml ...@@ -1050,11 +1050,6 @@ PPTX::Logic::SpTreeElem CAVSOfficeDrawingConverter::doc_LoadShape(XmlUtils::CXml
CString sTextInsetMode = oNodeTextBox.GetAttribute(_T("o:insetmode")); CString sTextInsetMode = oNodeTextBox.GetAttribute(_T("o:insetmode"));
if (_T("") != sTextInset && ((_T("") == sTextInsetMode) || (_T("custom") == sTextInsetMode))) if (_T("") != sTextInset && ((_T("") == sTextInsetMode) || (_T("custom") == sTextInsetMode)))
{ {
CString sL = _T("0.1in");
CString sT = _T("0.05in");
CString sR = _T("0.1in");
CString sB = _T("0.05in");
PPTX::CStringTrimmer oTrimmer; PPTX::CStringTrimmer oTrimmer;
oTrimmer.m_Separator = (TCHAR)','; oTrimmer.m_Separator = (TCHAR)',';
oTrimmer.LoadFromString(sTextInset); oTrimmer.LoadFromString(sTextInset);
......
...@@ -64,6 +64,9 @@ namespace PPTX ...@@ -64,6 +64,9 @@ namespace PPTX
if (nIndex < 0 || nIndex >= (int)m_arParams.GetCount()) if (nIndex < 0 || nIndex >= (int)m_arParams.GetCount())
return dDefault; return dDefault;
if (m_arParams[nIndex].GetLength() == 0)
return dDefault;
SimpleTypes::CPoint parserPoint; SimpleTypes::CPoint parserPoint;
return parserPoint.FromString(m_arParams[nIndex]); return parserPoint.FromString(m_arParams[nIndex]);
} }
......
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