Commit 087da9d2 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent c505aced
...@@ -1357,7 +1357,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T ...@@ -1357,7 +1357,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
if (odf_context()->drawing_context()->is_wordart()) if (odf_context()->drawing_context()->is_wordart())
odf_context()->drawing_context()->set_paragraph_properties(paragraph_properties); odf_context()->drawing_context()->set_paragraph_properties(paragraph_properties);
} }
//list_level++;
if (oox_paragraph->RunElems.empty() && list_present) list_present = false; // ms не обозначает присутствие списка, libra - показывает значек if (oox_paragraph->RunElems.empty() && list_present) list_present = false; // ms не обозначает присутствие списка, libra - показывает значек
...@@ -1374,8 +1373,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T ...@@ -1374,8 +1373,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
odf_context()->text_context()->list_state_.style_name = L""; odf_context()->text_context()->list_state_.style_name = L"";
} }
if (odf_context()->text_context()->list_state_.started_list == false)
{
if (list_local) if (list_local)
{ {
_CP_OPT(bool) inStyles = odf_context()->drawing_context()->get_presentation(); _CP_OPT(bool) inStyles = odf_context()->drawing_context()->get_presentation();
...@@ -1387,9 +1384,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T ...@@ -1387,9 +1384,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
} }
list_style_name = odf_context()->styles_context()->lists_styles().get_style_name(); //last added list_style_name = odf_context()->styles_context()->lists_styles().get_style_name(); //last added
//odf_context()->text_context()->start_list(list_style_name);
}
list_level++; list_level++;
if (odf_context()->text_context()->list_state_.levels.size() < list_level) if (odf_context()->text_context()->list_state_.levels.size() < list_level)
......
...@@ -955,7 +955,9 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS ...@@ -955,7 +955,9 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
smart_ptr<PPTX::WrapperWritingElement> pElem = oox_slide->spTree.SpTreeElems[i].GetElem(); smart_ptr<PPTX::WrapperWritingElement> pElem = oox_slide->spTree.SpTreeElems[i].GetElem();
smart_ptr<PPTX::Logic::Shape> pShape = pElem.smart_dynamic_cast<PPTX::Logic::Shape>(); smart_ptr<PPTX::Logic::Shape> pShape = pElem.smart_dynamic_cast<PPTX::Logic::Shape>();
if (pShape.IsInit() && pShape->nvSpPr.nvPr.ph.is_init()) if (pShape.IsInit())
{
if (pShape->nvSpPr.nvPr.ph.is_init())
{ {
pShape->FillLevelUp(); pShape->FillLevelUp();
...@@ -997,11 +999,22 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS ...@@ -997,11 +999,22 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
} }
update_shape.txBody->lstStyle.reset(newListStyle); update_shape.txBody->lstStyle.reset(newListStyle);
} }
pShape->Merge(update_shape); pShape->Merge(update_shape);
OoxConverter::convert(&update_shape); OoxConverter::convert(&update_shape);
}
else if (pShape->txBody.IsInit() && presentation->defaultTextStyle.IsInit())
{//default text style with master clrScheme
PPTX::Logic::Shape update_shape;
update_shape.txBody = new PPTX::Logic::TxBody();
presentation->defaultTextStyle->Merge(update_shape.txBody->lstStyle);
//OoxConverter::convert(pShape.operator->()); pShape->Merge(update_shape);
OoxConverter::convert(&update_shape);
}
else
OoxConverter::convert(pShape.operator->());
} }
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