Commit 52908908 authored by ElenaSubbotina's avatar ElenaSubbotina

fix linux build

parent 24d9b99a
......@@ -1308,7 +1308,7 @@ std::wstring NSPresentationEditor::CShapeWriter::ConvertShape()
m_oWriter.WriteString(std::wstring(L"</a:xfrm>"));
}
CBaseShapePtr & shape = m_pShapeElement->m_pShape->getBaseShape();
CBaseShapePtr shape = m_pShapeElement->m_pShape->getBaseShape();
if (m_pShapeElement->m_pShape->m_lDrawType & c_ShapeDrawType_Graphic || shape->m_bCustomShape)
{
......
......@@ -1848,7 +1848,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
std::map<std::wstring, CShapePtr>::iterator pPair = m_mapShapeTypes.find(strType);
if (m_mapShapeTypes.end() != pPair)
{
CBaseShapePtr & base_shape_type = pPair->second->getBaseShape();
CBaseShapePtr base_shape_type = pPair->second->getBaseShape();
CPPTShape* ppt_shape_type = dynamic_cast<CPPTShape*>(base_shape_type.get());
pPPTShape = new CPPTShape();
......
......@@ -1116,7 +1116,8 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
//Custom
if (!m_aPVerticles.empty() || !m_aPSegmentInfo.empty())
{
CPPTShape * custom_shape = CPPTShape::CreateByType((PPTShapes::ShapeType)m_nShapeType);
CBaseShapePtr base_shape = CPPTShape::CreateByType((PPTShapes::ShapeType)m_nShapeType);
CPPTShape *custom_shape = dynamic_cast<CPPTShape*>(base_shape.get());
if (custom_shape)
{
custom_shape->m_bCustomShape = true;
......
......@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.4.488.0
VERSION = 2.4.489.0
DEFINES += INTVER=$$VERSION
TARGET = x2t
......
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