pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix text paragraph conversion' (#508) from fix/TextStyle into release/v9.3.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/508
This commit is contained in:
Elena Subbotina
2025-12-18 14:53:16 +00:00
parent fba3767e36 e4c84e2972
commit c7e1250287
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OdfFile/Reader/Converter/pptx_text_context.cpp
View File

@ -100,6 +100,11 @@ public:
std::wstring get_last_paragraph_style_name();
void set_predump(const bool& bPredump);
bool get_lasttext();
void seroing_predump();
bool in_list_;
bool process_layouts_;
@ -114,6 +119,7 @@ private:
bool in_paragraph;
bool in_comment;
bool is_predump;
bool is_lasttext;
odf_reader::styles_container * local_styles_ptr_;
@ -163,7 +169,7 @@ private:
pptx_text_context::Impl::Impl(odf_reader::odf_read_context & odf_contxt_, pptx_conversion_context & pptx_contxt_):
odf_context_(odf_contxt_), pptx_context_(pptx_contxt_),
paragraphs_cout_(0), in_paragraph(false),in_span(false), in_comment(false), field_type_(none)
paragraphs_cout_(0), in_paragraph(false),in_span(false),is_predump(false),is_lasttext(false), in_comment(false), field_type_(none)
{
new_list_style_number_=0;
local_styles_ptr_ = NULL;
@ -175,7 +181,10 @@ void pptx_text_context::Impl::add_text(const std::wstring & text)
if (field_type_)
field_value_ << text;
else
{
is_lasttext = true;
text_ << text;
}
}
void pptx_text_context::Impl::add_paragraph(const std::wstring & para)
{
@ -198,7 +207,6 @@ void pptx_text_context::Impl::start_paragraph(const std::wstring & styleName)
//}
//else/* (paragraph_style_name_ != styleName)*/
{
is_predump = true;
dump_paragraph();
}
}else
@ -209,7 +217,6 @@ void pptx_text_context::Impl::start_paragraph(const std::wstring & styleName)
last_paragraph_style_name_ = paragraph_style_name_;
paragraph_style_name_ = styleName;
in_paragraph = true;
is_predump = false;
}
void pptx_text_context::Impl::end_paragraph()
@ -396,8 +403,14 @@ void pptx_text_context::Impl::write_pPr(std::wostream & strm)
get_styles_context().start();
int level = list_style_stack_.size() - 1;
if (is_predump)
level--;
if (is_predump && is_lasttext)
{
seroing_predump();
level = -1;
}
else
seroing_predump();
odf_reader::paragraph_format_properties paragraph_properties_;
@ -980,5 +993,31 @@ std::wstring pptx_text_context::get_last_paragraph_style_name()
return impl_->get_last_paragraph_style_name();
}
void pptx_text_context::set_predump(const bool &bPreDump)
{
impl_->set_predump(bPreDump);
}
bool pptx_text_context::get_lasttext()
{
return impl_->get_lasttext();
}
void pptx_text_context::Impl::set_predump(const bool& bPredump)
{
is_predump = bPredump;
}
bool pptx_text_context::Impl::get_lasttext()
{
return is_lasttext;
}
void pptx_text_context::Impl::seroing_predump()
{
is_predump = false;
is_lasttext = false;
}
}
}

5
OdfFile/Reader/Converter/pptx_text_context.h
View File

@ -114,6 +114,9 @@ public:
std::wstring get_last_paragraph_style_name();
void set_predump(const bool& bPreDump);
bool get_lasttext();
private:
class Impl;
@ -123,4 +126,4 @@ private:
};
}
}
}

3
OdfFile/Reader/Format/draw_frame_pptx.cpp
View File

@ -411,7 +411,10 @@ void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
for (size_t i = 0; i < content_.size(); i++)
{
(i > 0 && Context.get_text_context().get_lasttext() && content_[i-1]->get_type() == cpdoccore::ElementType::typeTextP ? Context.get_text_context().set_predump(true): Context.get_text_context().set_predump(false));
content_[i]->pptx_convert(Context);
}
std::wstring text_content_ = Context.get_text_context().end_object();