Commit 66b45dba authored by ElenaSubbotina's avatar ElenaSubbotina

fix users file

parent 2ce57085
...@@ -3025,7 +3025,7 @@ namespace BinDocxRW ...@@ -3025,7 +3025,7 @@ namespace BinDocxRW
std::wstring& sShapeType = aShapeTypes[i]; std::wstring& sShapeType = aShapeTypes[i];
pOfficeDrawingConverter->AddShapeType(sShapeType); pOfficeDrawingConverter->AddShapeType(sShapeType);
} }
pOfficeDrawingConverter->SetRels(oldRels); pOfficeDrawingConverter->SetRels(oldRels);
} }
void WriteVbaProjectContent(OOX::VbaProject& oVbaProject) void WriteVbaProjectContent(OOX::VbaProject& oVbaProject)
{ {
......
...@@ -2228,8 +2228,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C ...@@ -2228,8 +2228,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
std::wstring strPos = arSplit[i].substr(0, p); std::wstring strPos = arSplit[i].substr(0, p);
std::wstring strColor = arSplit[i].substr(p + 1); std::wstring strColor = arSplit[i].substr(p + 1);
double pos; double pos = strPos.empty() ? 0 : _wtof(strPos.c_str());
pos = _wtof(strPos.c_str());
NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(strColor); NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(strColor);
PPTX::Logic::UniColor *oColor = new PPTX::Logic::UniColor(); PPTX::Logic::UniColor *oColor = new PPTX::Logic::UniColor();
......
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