Skip to content

O
onlyoffice_core
Commit 8d358a09 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

OdfFormat..

parent 2b0c5147
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 70 deletions
ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp
View file @ 8d358a09
......@@ -44,6 +44,7 @@
#include "../odf/odfcontext.h"
#include "../odf/style_paragraph_properties.h"
#include "../odf/style_text_properties.h"
#include "../odf/style_table_properties.h"
#include "../odf/style_graphic_properties.h"
#include "../odf/datatypes/style_ref.h"
......@@ -1301,6 +1302,8 @@ void docx_conversion_context::start_changes()
text_tracked_context_.dumpPPr_.clear();
text_tracked_context_.dumpRPr_.clear();
text_tracked_context_.dumpRPrInsDel_.clear();
text_tracked_context_.dumpTcPr_.clear();
text_tracked_context_.dumpTblPr_.clear();
for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); it++)
{
......@@ -1329,45 +1332,63 @@ void docx_conversion_context::start_changes()
odf_reader::style_instance * styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Paragraph, false);
if (styleInst)
{
odf_reader::style_paragraph_properties * props = NULL;
props = styleInst->content()->get_style_paragraph_properties();
odf_reader::style_paragraph_properties * props = styleInst->content()->get_style_paragraph_properties();
odf_reader::style_text_properties * props_text = styleInst->content()->get_style_text_properties();
text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr;
if (props)
{
props->docx_convert(*this);
odf_reader::style_text_properties * t_props = NULL;
t_props = styleInst->content()->get_style_text_properties();
if (t_props)
props->docx_convert(*this);
std::wstring attr = get_styles_context().paragraph_attr().str();
text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr + (attr.empty() ? L">" : (L" " + attr + L">"));
text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
if (t_props)
{
text_tracked_context_.dumpPPr_ += L"<w:rPr>";
text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
text_tracked_context_.dumpPPr_ += L"</w:rPr>";
}
text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_attr().str();
}
text_tracked_context_.dumpPPr_ += L">";
if (props) text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
if (props_text)
{
props_text->docx_convert(*this);
text_tracked_context_.dumpPPr_ += L"<w:rPr>";
text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
text_tracked_context_.dumpPPr_ += L"</w:rPr>";
}
else
text_tracked_context_.dumpPPr_ = L"<w:pPrChange/>";
text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
}
else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Text, false))
{
text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
odf_reader::style_text_properties * props = NULL;
props = styleInst->content()->get_style_text_properties();
if (props)
{
props->docx_convert(*this);
text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
text_tracked_context_.dumpRPr_ += get_styles_context().text_style().str();
text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
}else
text_tracked_context_.dumpRPr_ = L"<w:rPrChange/>";
}
text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
}
else
else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Table, false))
{
text_tracked_context_.dumpTblPr_ = L"<w:TblPrChange" + change_attr + L">";
odf_reader::style_table_properties * props = styleInst->content()->get_style_table_properties();
odf_reader::style_table_cell_properties * props_cell = styleInst->content()->get_style_table_cell_properties();
if (props)
{
props->docx_convert(*this);
text_tracked_context_.dumpTblPr_ += get_styles_context().table_style().str();
}
text_tracked_context_.dumpTblPr_ += L"</w:TblPrChange>";
}
else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::TableCell, false))
{
text_tracked_context_.dumpTcPr_ = L"<w:TcPrChange" + change_attr + L">";
odf_reader::style_table_cell_properties * props = styleInst->content()->get_style_table_cell_properties();
if (props)
{
props->docx_convert(*this);
text_tracked_context_.dumpTcPr_ += get_styles_context().table_style().str();
}
text_tracked_context_.dumpTcPr_ += L"</w:TcPrChange>";
}
}
}
......@@ -1386,6 +1407,8 @@ void docx_conversion_context::end_changes()
// if (state.type == 2) output_stream() << L"</w:del>";
//}
text_tracked_context_.dumpTcPr_.clear();
text_tracked_context_.dumpTblPr_.clear();
text_tracked_context_.dumpRPrInsDel_.clear();
text_tracked_context_.dumpPPr_.clear();
text_tracked_context_.dumpRPr_.clear();
......
ASCOfficeOdfFile/src/docx/docx_conversion_context.h
View file @ 8d358a09
......@@ -509,6 +509,8 @@ public:
std::wstring dumpPPr_;
std::wstring dumpRPr_;
std::wstring dumpRPrInsDel_;
std::wstring dumpTblPr_;
std::wstring dumpTcPr_;
text_tracked_context(docx_conversion_context & context);
......@@ -719,6 +721,9 @@ public:
bool delayed_converting_;
bool convert_delayed_enabled_;
void start_changes();
void end_changes();
private:
std::wstringstream document_xml_;
std::wstringstream styles_xml_;
......@@ -791,10 +796,6 @@ private:
// цепочки переименований нумераций
boost::unordered_map<std::wstring, std::wstring> list_style_renames_;
void start_changes();
void end_changes();
};
}
......
ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp
View file @ 8d358a09
......@@ -124,7 +124,7 @@ void styles_context::docx_serialize_text_style(std::wostream & strm, std::wstrin
}
}
void styles_context::docx_serialize_table_style(std::wostream & strm)
void styles_context::docx_serialize_table_style(std::wostream & strm, std::wstring & strChange)
{
if (!table_style_.str().empty())
{
......@@ -133,6 +133,11 @@ void styles_context::docx_serialize_table_style(std::wostream & strm)
CP_XML_NODE(L"w:tblPr")
{
CP_XML_STREAM() << table_style_.str();
if (!strChange.empty())//tblPrChange
{
CP_XML_STREAM() << strChange;
strChange.clear();
}
}
}
}
......
ASCOfficeOdfFile/src/docx/oox_conversion_context.h
View file @ 8d358a09
......@@ -58,10 +58,10 @@ public:
std::wstringstream & table_style();
std::wstringstream & list_style();
void docx_serialize_text_style(std::wostream & strm, std::wstring parenStyleId, std::wstring & strChange);
void docx_serialize_table_style(std::wostream & strm);
void docx_serialize_text_style (std::wostream & strm, std::wstring parenStyleId, std::wstring & strChange);
void docx_serialize_table_style (std::wostream & strm, std::wstring & strChange);
void pptx_serialize_table_style(std::wostream & strm);
void pptx_serialize_table_style (std::wostream & strm);
std::wstring & extern_node(){return extern_node_;}
std::wstring & hlinkClick(){return hlinkClick_;}
......
ASCOfficeOdfFile/src/odf/table_docx.cpp
View file @ 8d358a09
......@@ -154,6 +154,8 @@ void table_table::docx_convert(oox::docx_conversion_context & Context)
_Wostream << L"<w:tbl>";
Context.start_changes(); //TblPrChange
Context.get_table_context().start_table(tableStyleName);
style_instance * inst =
......@@ -164,7 +166,8 @@ void table_table::docx_convert(oox::docx_conversion_context & Context)
if (inst && inst->content())
inst->content()->docx_convert(Context);
Context.get_styles_context().docx_serialize_table_style(_Wostream);
Context.get_styles_context().docx_serialize_table_style(_Wostream, Context.get_text_tracked_context().dumpTblPr_);
_Wostream << L"<w:tblGrid>";
table_columns_and_groups_.docx_convert(Context);
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @ 8d358a09
......@@ -441,17 +441,20 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
{
//удаление знака абзаца - объединение со следующим - в либре нету
//id = convert(oox_paragraph->m_oParagraphProperty->m_oRPr->m_oDel.GetPointer(), 2);
//if (id >= 0) id_change_properties.push_back(std::pair<int, int> (2, id));
//if (id >= 0)
// id_change_properties.push_back(std::pair<int, int> (2, id));
//вставка знака абзаца - разделение текущего параграфа - в либре нету
//if (oox_paragraph->m_arrItems.size() < 2)//только для пустых
{
id = convert(oox_paragraph->m_oParagraphProperty->m_oRPr->m_oIns.GetPointer(), 1);
if (id >= 0) id_change_properties.push_back(std::pair<int, int> (1, id));
if (id >= 0)
id_change_properties.push_back(std::pair<int, int> (1, id));
}
id = convert(oox_paragraph->m_oParagraphProperty->m_oRPr->m_oRPrChange.GetPointer());
if (id >= 0) id_change_properties.push_back(std::pair<int, int> (3, id));
if (id >= 0)
id_change_properties.push_back(std::pair<int, int> (3, id));
}
//if (oox_paragraph->m_oParagraphProperty->m_oSectPr.IsInit())
......@@ -461,7 +464,8 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
//}
id = convert(oox_paragraph->m_oParagraphProperty->m_oPPrChange.GetPointer());
if (id >= 0) id_change_properties.push_back(std::pair<int, int> (3, id));
if (id >= 0)
id_change_properties.push_back(std::pair<int, int> (3, id));
}
//---------------------------------------------------------------------------------------------------------------------
if(oox_paragraph->m_oParagraphProperty && odt_context->text_context()->get_list_item_state() == false)
......@@ -885,7 +889,6 @@ int DocxConverter::convert(OOX::Logic::CSectPrChange *oox_sect_prop_change)
{
convert(oox_sect_prop_change->m_pSecPr.GetPointer());
//odt_context->end_change(id, 3); в конце секции
return id;
}
return -1;
......@@ -943,7 +946,6 @@ int DocxConverter::convert(OOX::Logic::CPPrChange *oox_para_prop_change)
}
if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
//odt_context->end_change(id, 3); в конце параграфа
return id;
}
int DocxConverter::convert(OOX::Logic::CRPrChange *oox_run_prop_change)
......@@ -958,7 +960,7 @@ int DocxConverter::convert(OOX::Logic::CRPrChange *oox_run_prop_change)
if (oox_run_prop_change->m_pRunPr.IsInit())
{
odt_context->styles_context()->create_style(L"",odf_types::style_family::Text, true, false, -1);
odt_context->styles_context()->create_style(L"", odf_types::style_family::Text, true, false, -1);
odf_writer::style_text_properties * text_properties = odt_context->styles_context()->last_state()->get_text_properties();
convert(oox_run_prop_change->m_pRunPr.GetPointer(), text_properties);
......@@ -969,7 +971,6 @@ int DocxConverter::convert(OOX::Logic::CRPrChange *oox_run_prop_change)
}
if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
//odt_context->end_change(id, 3); в конце run
return id;
}
int DocxConverter::convert(OOX::Logic::CTrPrChange *oox_tr_prop_change)
......@@ -980,6 +981,11 @@ int DocxConverter::convert(OOX::Logic::CTrPrChange *oox_tr_prop_change)
std::wstring userId = oox_tr_prop_change->m_sUserId.IsInit() ? oox_tr_prop_change->m_sUserId.get2() : L"";
int id = oox_tr_prop_change->m_oId.IsInit() ? oox_tr_prop_change->m_oId->GetValue() : -1;
std::wstring date = oox_tr_prop_change->m_oDate.IsInit() ? oox_tr_prop_change->m_oDate->GetValue() : L"";
std::wstring style_name;
odf_writer::odf_style_state_ptr style_state = odt_context->styles_context()->last_state(style_family::Text);
if (style_state)
style_name = style_state->get_name();
if (odt_context->start_change(id, 3, author, userId, date))
{
......@@ -987,7 +993,8 @@ int DocxConverter::convert(OOX::Logic::CTrPrChange *oox_tr_prop_change)
//odt_context->end_change(id, 3); в конце row
return id;
}
return -1;
if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
return id;
}
int DocxConverter::convert(OOX::Logic::CTcPrChange *oox_tc_prop_change)
{
......@@ -997,14 +1004,19 @@ int DocxConverter::convert(OOX::Logic::CTcPrChange *oox_tc_prop_change)
std::wstring userId = oox_tc_prop_change->m_sUserId.IsInit() ? oox_tc_prop_change->m_sUserId.get2() : L"";
int id = oox_tc_prop_change->m_oId.IsInit() ? oox_tc_prop_change->m_oId->GetValue() : -1;
std::wstring date = oox_tc_prop_change->m_oDate.IsInit() ? oox_tc_prop_change->m_oDate->GetValue() : L"";
std::wstring style_name;
if (odt_context->start_change(id, 3, author, userId, date))
if (oox_tc_prop_change->m_pTcPr.IsInit())
{
convert(oox_tc_prop_change->m_pTcPr.GetPointer());
//odt_context->end_change(id, 3); в конце cell
return id;
odf_writer::odf_style_state_ptr style_state = odt_context->styles_context()->last_state(style_family::TableCell);
if (style_state)
style_name = style_state->get_name();
}
return -1;
if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
return id;
}
int DocxConverter::convert(OOX::Logic::CTblPrChange *oox_table_prop_change)
{
......@@ -1014,14 +1026,28 @@ int DocxConverter::convert(OOX::Logic::CTblPrChange *oox_table_prop_change)
std::wstring userId = oox_table_prop_change->m_sUserId.IsInit() ? oox_table_prop_change->m_sUserId.get2() : L"";
int id = oox_table_prop_change->m_oId.IsInit() ? oox_table_prop_change->m_oId->GetValue() : -1;
std::wstring date = oox_table_prop_change->m_oDate.IsInit() ? oox_table_prop_change->m_oDate->GetValue() : L"";
std::wstring style_name;
if (odt_context->start_change(id, 3, author, userId, date))
if (oox_table_prop_change->m_pTblPr.IsInit())
{
convert(oox_table_prop_change->m_pTblPr.GetPointer());
//odt_context->end_change(id, 3); в конце таблицы
return id;
bool table_styled = false;
if (oox_table_prop_change->m_pTblPr->m_oTblStyle.IsInit() && oox_table_prop_change->m_pTblPr->m_oTblStyle->m_sVal.IsInit())
{//настройка предустановленного стиля
std::wstring base_style_name = string2std_string(*oox_table_prop_change->m_pTblPr->m_oTblStyle->m_sVal);
table_styled = odt_context->styles_context()->table_styles().start_table(base_style_name);
}
convert(oox_table_prop_change->m_pTblPr.GetPointer(), table_styled);
odf_writer::odf_style_state_ptr style_state = odt_context->styles_context()->last_state(style_family::Table);
if (style_state)
style_name = style_state->get_name();
}
return -1;
if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
return id;
}
void DocxConverter::convert(OOX::Logic::CDel *oox_del)
{
......@@ -1818,16 +1844,16 @@ void DocxConverter::convert(OOX::Logic::CPBdr *oox_border, odf_writer::style_par
paragraph_properties->content().common_border_attlist_.fo_border_ = boost::none;
if (bottom.length() >0 )paragraph_properties->content().common_border_attlist_.fo_border_bottom_ = bottom;
if (top.length() >0 ) paragraph_properties->content().common_border_attlist_.fo_border_top_ = top;
if (left.length() >0 ) paragraph_properties->content().common_border_attlist_.fo_border_left_ = left;
if (right.length() >0 ) paragraph_properties->content().common_border_attlist_.fo_border_right_ = right;
if (bottom.length() > 0 ) paragraph_properties->content().common_border_attlist_.fo_border_bottom_ = bottom;
if (top.length() > 0 ) paragraph_properties->content().common_border_attlist_.fo_border_top_ = top;
if (left.length() > 0 ) paragraph_properties->content().common_border_attlist_.fo_border_left_ = left;
if (right.length() > 0 ) paragraph_properties->content().common_border_attlist_.fo_border_right_ = right;
}
bool shadow = false;
if (oox_border->m_oBottom.IsInit() && oox_border->m_oBottom->m_oShadow.IsInit() && oox_border->m_oBottom->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oTop.IsInit() && oox_border->m_oTop->m_oShadow.IsInit() && oox_border->m_oTop->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oLeft.IsInit() && oox_border->m_oLeft->m_oShadow.IsInit() && oox_border->m_oLeft->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oRight.IsInit() && oox_border->m_oRight->m_oShadow.IsInit() && oox_border->m_oRight->m_oShadow->ToBool()) shadow = true;
bool shadow = false;//в либре только одна тень (
if (oox_border->m_oBottom.IsInit() && oox_border->m_oBottom->m_oShadow.IsInit() && oox_border->m_oBottom->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oTop.IsInit() && oox_border->m_oTop->m_oShadow.IsInit() && oox_border->m_oTop->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oLeft.IsInit() && oox_border->m_oLeft->m_oShadow.IsInit() && oox_border->m_oLeft->m_oShadow->ToBool()) shadow = true;
if (oox_border->m_oRight.IsInit() && oox_border->m_oRight->m_oShadow.IsInit() && oox_border->m_oRight->m_oShadow->ToBool()) shadow = true;
if (shadow)
{
......@@ -3844,6 +3870,7 @@ void DocxConverter::convert_hdr_ftr (CString sId)
}
oox_current_child_document = NULL;
}
void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
{
if (oox_table == NULL) return;
......@@ -3857,10 +3884,15 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
//if (in_list, but not in paragraph)
odt_context->set_no_list();
bool styled_table = false;
bool in_frame = false;
int in_frame_anchor = odf_types::anchor_type::Paragraph;
bool styled_table = false;
bool in_frame = false;
int in_frame_anchor = odf_types::anchor_type::Paragraph;
int id_change_properties = -1;
if (oox_table->m_oTableProperties)
id_change_properties = convert(oox_table->m_oTableProperties->m_oTblPrChange.GetPointer());
if (oox_table->m_oTableProperties && (oox_table->m_oTableProperties->m_oTblStyle.IsInit() && oox_table->m_oTableProperties->m_oTblStyle->m_sVal.IsInit()))
{//настройка предустановленного стиля
std::wstring base_style_name = string2std_string(*oox_table->m_oTableProperties->m_oTblStyle->m_sVal);
......@@ -4002,9 +4034,8 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
odt_context->table_context()->set_table_inside_v(border_inside_v);
odt_context->table_context()->set_table_inside_h(border_inside_h);
int count_rows = oox_table->m_nCountRow;
int count_columns = 0;
if (oox_table->m_oTblGrid.IsInit())count_columns = oox_table->m_oTblGrid->m_arrGridCol.size();
int count_rows = oox_table->m_nCountRow;
int count_columns = oox_table->m_oTblGrid.IsInit() ? oox_table->m_oTblGrid->m_arrGridCol.size() : 0;
odt_context->styles_context()->table_styles().set_current_dimension(count_columns, count_rows);
odt_context->table_context()->count_rows(count_rows);
......@@ -4049,13 +4080,19 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
odt_context->text_context()->set_KeepNextParagraph(true);
}
if (id_change_properties >= 0)
odt_context->end_change(id_change_properties, 3);
}
void DocxConverter::convert(OOX::Logic::CTblGrid *oox_table_grid)
{
if (oox_table_grid == NULL) return;
int id_change_properties = convert(oox_table_grid->m_oTblGridChange.GetPointer());
odt_context->start_table_columns();
//nullable<OOX::Logic::CTblGridChange > m_oTblGridChange;
for (int i =0 ; i < oox_table_grid->m_arrGridCol.size(); i++)
{
if (oox_table_grid->m_arrGridCol[i] == NULL) continue;
......@@ -4076,7 +4113,26 @@ void DocxConverter::convert(OOX::Logic::CTblGrid *oox_table_grid)
}
odt_context->end_table_columns();
if (id_change_properties >= 0)
odt_context->end_change(id_change_properties, 3);
}
int DocxConverter::convert(OOX::Logic::CTblGridChange *oox_table_grid_prop_change)
{
if (!oox_table_grid_prop_change) return -1;
int id = oox_table_grid_prop_change->m_oId.IsInit() ? oox_table_grid_prop_change->m_oId->GetValue() : -1;
//std::wstring author = oox_table_grid_prop_change->m_sAuthor.IsInit() ? oox_table_grid_prop_change->m_sAuthor.get2() : L"";
//std::wstring userId = oox_table_grid_prop_change->m_sUserId.IsInit() ? oox_table_grid_prop_change->m_sUserId.get2() : L"";
//std::wstring date = oox_table_grid_prop_change->m_oDate.IsInit() ? oox_table_grid_prop_change->m_oDate->GetValue() : L"";
/// ( нету в либре подходящей схемы
//if (!odt_context->start_change(id, 3, author, userId, date, style_name)) return -1;
//return id;
return -1;
}
void DocxConverter::convert(OOX::Logic::CTr *oox_table_row)
{
if (oox_table_row == NULL) return;
......@@ -4084,6 +4140,16 @@ void DocxConverter::convert(OOX::Logic::CTr *oox_table_row)
bool styled = oox_table_row->m_oTableRowProperties ? true : false;
bool is_header = false;
int id_insert_row = -1;
int id_delete_row = -1;
if (oox_table_row->m_oTableRowProperties)
{//+ Format ???
//id_insert_row = convert(oox_table_row->m_oTableRowProperties->m_oIns.GetPointer(), 1);
//id_delete_row = convert(oox_table_row->m_oTableRowProperties->m_oDel.GetPointer(), 2);
//??? как в электороных таблицах? или ваще нету?
}
if (styled && oox_table_row->m_oTableRowProperties->m_oTblHeader.IsInit()
&& oox_table_row->m_oTableRowProperties->m_oTblHeader->m_oVal.ToBool() )is_header = true;
......@@ -4108,15 +4174,27 @@ void DocxConverter::convert(OOX::Logic::CTr *oox_table_row)
odt_context->end_table_row();
if (is_header)odt_context->end_table_header_rows();
if (id_insert_row >= 0)
odt_context->end_change(id_insert_row, 1);
if (id_delete_row >= 0)
odt_context->end_change(id_delete_row, 2);
}
void DocxConverter::convert(OOX::Logic::CTc *oox_table_cell)
{
if (oox_table_cell == NULL) return;
bool covered = false;
bool covered = false;
int id_change_properties = -1;
if (oox_table_cell->m_oTableCellProperties)
{
//id_change_properties = convert(oox_table_cell->m_oTableCellProperties->m_oCellIns.GetPointer()); ??
//id_change_properties = convert(oox_table_cell->m_oTableCellProperties->m_oCellDel.GetPointer()); ??
//id_change_properties = convert(oox_table_cell->m_oTableCellProperties->m_oTcPrChange.GetPointer());
//??? как в электороных таблицах? или ваще нету?
if (oox_table_cell->m_oTableCellProperties->m_oVMerge.IsInit())
{
if (!(oox_table_cell->m_oTableCellProperties->m_oVMerge->m_oVal.IsInit() &&
......@@ -4154,6 +4232,9 @@ void DocxConverter::convert(OOX::Logic::CTc *oox_table_cell)
}
}
odt_context->end_table_cell();
if (id_change_properties >= 0)
odt_context->end_change(id_change_properties, 3);
}
bool DocxConverter::convert(OOX::Logic::CTableProperty *oox_table_pr, odf_writer::style_table_properties * table_properties )
{
......@@ -4234,7 +4315,6 @@ bool DocxConverter::convert(OOX::Logic::CTableProperty *oox_table_pr, odf_writer
//nullable<ComplexTypes::Word::CString_ > m_oTblDescription;
//nullable<ComplexTypes::Word::CTblLayoutType > m_oTblLayout;
//nullable<ComplexTypes::Word::CTblOverlap > m_oTblOverlap;
//nullable<OOX::Logic::CTblPrChange > m_oTblPrChange;
return true;
}
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.h
View file @ 8d358a09
......@@ -56,6 +56,7 @@ namespace OOX
class CTrPrChange;
class CTcPrChange;
class CTblPrChange;
class CTblGridChange;
class CParagraph;
class CParagraphProperty;
class CPTab;
......@@ -208,6 +209,7 @@ namespace Oox2Odf
int convert(OOX::Logic::CTrPrChange *oox_tr_prop_change);
int convert(OOX::Logic::CTcPrChange *oox_tc_prop_change);
int convert(OOX::Logic::CTblPrChange *oox_table_prop_change);
int convert(OOX::Logic::CTblGridChange *oox_table_grid_prop_change);
void convert(OOX::Logic::CAlternateContent *oox_alt_content);
void convert(OOX::Logic::CDrawing *oox_drawing);
......@@ -261,7 +263,7 @@ namespace Oox2Odf
bool convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr, int col = -1);
bool convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr, odf_writer::style_table_cell_properties *table_cell_properties/*,odf_writer::style_table_cell_properties * table_cell_properties = NULL*/);
bool convert(OOX::Logic::CTableProperty *oox_table_pr, bool base_styled);
bool convert(OOX::Logic::CTableProperty *oox_table_pr, bool base_styled);
bool convert(OOX::Logic::CTableProperty *oox_table_pr, odf_writer::style_table_properties *table_properties);
void convert(OOX::Logic::CTableProperty *oox_table_pr, odf_writer::style_table_cell_properties *table_cell_properties);
void convert(OOX::Logic::CTableRowProperties *oox_table_row_pr);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7