Skip to content

O
onlyoffice_core
Commit 4c12ba9c authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

OdfFormatReader - fix bugs...

parent eae048a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 106 deletions
ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp
View file @ 4c12ba9c
...@@ -260,12 +260,22 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f) ...@@ -260,12 +260,22 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
{ {
impl_->conditionalFormattings_.back().rules.back().formula_type = L"expression"; impl_->conditionalFormattings_.back().rules.back().formula_type = L"expression";
val = f.substr(11, f.size() - 12); val = f.substr(11, f.size() - 12);
if (0 == (pos = val.find(L"\""))) //Raport_7A.ods или выкинуть ограждающие кавычки с формулы?
{
impl_->conditionalFormattings_.back().rules.back().text = val;
val.clear();
}
impl_->conditionalFormattings_.back().rules.back().formula = converter.convert(val);
} }
else if (0 <= (pos = f.find(L"is-between("))) else if (0 <= (pos = f.find(L"is-between(")))
{ {
impl_->conditionalFormattings_.back().rules.back().formula = converter.convert_named_expr(val);
} }
else if (0 <= (pos = f.find(L"is-time("))) else if (0 <= (pos = f.find(L"is-time(")))
{ {
impl_->conditionalFormattings_.back().rules.back().formula = converter.convert_named_expr(val);
} }
else else
{ {
...@@ -273,46 +283,50 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f) ...@@ -273,46 +283,50 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
if (0 <= (pos = f.find(L"!empty"))) if (0 <= (pos = f.find(L"!empty")))
{ {
val = converter.convert_named_expr( f );
} }
else if (0 <= (pos = f.find(L"empty"))) else if (0 <= (pos = f.find(L"empty")))
{ {
val = converter.convert_named_expr( f );
} }
else if (0 <= (pos = f.find(L"bottom"))) else if (0 <= (pos = f.find(L"bottom")))
{ {
val = converter.convert_named_expr( f );
} }
else if (0 <= (pos = f.find(L"top"))) else if (0 <= (pos = f.find(L"top")))
{ {
impl_->conditionalFormattings_.back().rules.back().formula_type = L"top10"; impl_->conditionalFormattings_.back().rules.back().formula_type = L"top10";
val = converter.convert_named_expr( f );
} }
else if (0 <= (pos = f.find(L"!="))) else if (0 <= (pos = f.find(L"!=")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"notEqual"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"notEqual";
val = f.substr(2); val = converter.convert_named_expr( f.substr(2) );
} }
else if (0 <= (pos = f.find(L"<="))) else if (0 <= (pos = f.find(L"<=")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"lessThanOrEqual"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"lessThanOrEqual";
val = f.substr(2); val = converter.convert_named_expr( f.substr(2) );
} }
else if (0 <= (pos = f.find(L">="))) else if (0 <= (pos = f.find(L">=")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"greaterThanOrEqual"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"greaterThanOrEqual";
val = f.substr(2); val = converter.convert_named_expr( f.substr(2) );
} }
else if (0 <= (pos = f.find(L"="))) else if (0 <= (pos = f.find(L"=")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"equal"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"equal";
val = f.substr(1); val = converter.convert_named_expr( f.substr(1) );
} }
else if (0 <= (pos = f.find(L"<"))) else if (0 <= (pos = f.find(L"<")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"lessThan"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"lessThan";
val = f.substr(1); val = converter.convert_named_expr( f.substr(1) );
} }
else if (0 <= (pos = f.find(L">"))) else if (0 <= (pos = f.find(L">")))
{ {
impl_->conditionalFormattings_.back().rules.back().operator_ = L"greaterThan"; impl_->conditionalFormattings_.back().rules.back().operator_ = L"greaterThan";
val = f.substr(1); val = converter.convert_named_expr( f.substr(1) );
} }
else if (0 <= (pos = f.find(L"contains-text"))) else if (0 <= (pos = f.find(L"contains-text")))
{ {
...@@ -327,17 +341,20 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f) ...@@ -327,17 +341,20 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
if (0 <= (pos = val.find(L","))) if (0 <= (pos = val.find(L",")))
{ {
impl_->conditionalFormattings_.back().rules.back().formula2 = converter.convert_named_expr(val.substr(pos + 1)); impl_->conditionalFormattings_.back().rules.back().formula2 = converter.convert_named_expr( val.substr(pos + 1) );
val = val.substr(0, pos); val = val.substr(0, pos);
} }
val = converter.convert_named_expr( val );
} }
else else
{ {
val = f; val = converter.convert( f );
} }
if (!val.empty())
impl_->conditionalFormattings_.back().rules.back().formula = val;
} }
impl_->conditionalFormattings_.back().rules.back().formula = converter.convert_named_expr(val);
} }
void xlsx_conditionalFormatting_context::set_dataBar(_CP_OPT(int) min, _CP_OPT(int) max) void xlsx_conditionalFormatting_context::set_dataBar(_CP_OPT(int) min, _CP_OPT(int) max)
{ {
......
ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp
View file @ 4c12ba9c
...@@ -471,6 +471,9 @@ void xlsx_drawing_context::process_position_properties(drawing_object_descriptio ...@@ -471,6 +471,9 @@ void xlsx_drawing_context::process_position_properties(drawing_object_descriptio
x = obj.anchor_x_ - cx; x = obj.anchor_x_ - cx;
y = obj.anchor_y_ - cy; y = obj.anchor_y_ - cy;
if (x < 0) x = 0;
if (y < 0) y = 0; // calcul dun MS.ods
to = pos_anchor; to = pos_anchor;
from = table_metrics.calc(x, y); from = table_metrics.calc(x, y);
......
ASCOfficeOdfFile/src/docx/xlsx_table_metrics.h
View file @ 4c12ba9c
...@@ -44,18 +44,18 @@ namespace oox ...@@ -44,18 +44,18 @@ namespace oox
class xlsx_table_metrics class xlsx_table_metrics
{ {
public: public:
xlsx_table_metrics(); xlsx_table_metrics ();
~xlsx_table_metrics(); ~xlsx_table_metrics ();
public: public:
xlsx_table_position calc(double x_pt, double y_pt); xlsx_table_position calc (double x_pt, double y_pt);
xlsx_table_position calc(size_t offset_col,size_t offset_row,double x_pt, double y_pt); xlsx_table_position calc (int offset_col, int offset_row, double x_pt, double y_pt);
xlsx_table_position calc(size_t last_col,size_t last_row); xlsx_table_position calc (int last_col, int last_row);
void update_pt(size_t offset_col,size_t offset_row,double &x_pt, double &y_pt); void update_pt (int offset_col, int offset_row, double &x_pt, double &y_pt);
void add_cols(size_t count, double widht_pt); void add_cols (int count, double widht_pt);
void add_rows(size_t count, double height_pt); void add_rows (int count, double height_pt);
private: private:
class Impl; class Impl;
......
ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp
View file @ 4c12ba9c
...@@ -191,8 +191,8 @@ std::wstring xlsx_table_state::default_row_cell_style() const ...@@ -191,8 +191,8 @@ std::wstring xlsx_table_state::default_row_cell_style() const
std::wstring xlsx_table_state::default_column_cell_style() const std::wstring xlsx_table_state::default_column_cell_style() const
{ {
if (current_table_column_ < column_default_cell_style_name_.size()) if (current_table_column_ + 1 < column_default_cell_style_name_.size())
return column_default_cell_style_name_.at(current_table_column_); return column_default_cell_style_name_.at(current_table_column_ + 1);
else else
{ {
//непонятная хрень!! - неправильно сформирован ods??? //непонятная хрень!! - неправильно сформирован ods???
......
ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp
View file @ 4c12ba9c
...@@ -179,7 +179,7 @@ void xlsx_conversion_context::end_document() ...@@ -179,7 +179,7 @@ void xlsx_conversion_context::end_document()
{ {
CP_XML_NODE(L"sheet") CP_XML_NODE(L"sheet")
{ {
CP_XML_ATTR(L"name", sheet->name()); CP_XML_ATTR(L"name", sheet->name()); // office 2010 ! ограничение на длину имени !!!
CP_XML_ATTR(L"sheetId", count); CP_XML_ATTR(L"sheetId", count);
CP_XML_ATTR(L"state", L"visible"); CP_XML_ATTR(L"state", L"visible");
CP_XML_ATTR(L"r:id", id); CP_XML_ATTR(L"r:id", id);
......
ASCOfficeOdfFile/src/odf/table_xlsx.cpp
View file @ 4c12ba9c
...@@ -80,7 +80,7 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context) ...@@ -80,7 +80,7 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
///обработка чтилей для роу - ///обработка чтилей для роу -
size_t Default_Cell_style_in_row_ = 0; size_t Default_Cell_style_in_row_ = 0;
const std::wstring rowStyleName = table_table_row_attlist_.table_style_name_.get_value_or(L""); const std::wstring rowStyleName = table_table_row_attlist_.table_style_name_.get_value_or(L"");
const std::wstring defaultCellStyleName = table_table_row_attlist_.table_default_cell_style_name_.get_value_or( L""); const std::wstring defaultCellStyleName = table_table_row_attlist_.table_default_cell_style_name_.get_value_or( L"");
style_instance * instStyle_CellDefault = style_instance * instStyle_CellDefault =
...@@ -604,45 +604,49 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context) ...@@ -604,45 +604,49 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
{ {
std::wostream & strm = Context.current_sheet().sheetData(); std::wostream & strm = Context.current_sheet().sheetData();
const std::wstring formula = table_table_cell_attlist_.table_formula_.get_value_or(L"");
const std::wstring styleName = table_table_cell_attlist_.table_style_name_.get_value_or(L"");
const common_value_and_type_attlist & attr = table_table_cell_attlist_.common_value_and_type_attlist_; const common_value_and_type_attlist & attr = table_table_cell_attlist_.common_value_and_type_attlist_;
office_value_type::type odf_value_type = office_value_type::Custom; office_value_type::type odf_value_type = office_value_type::Custom;
oox::XlsxCellType::type t_val = oox::XlsxCellType::s; oox::XlsxCellType::type t_val = oox::XlsxCellType::s;
std::wstring number_val = L""; std::wstring formula = table_table_cell_attlist_.table_formula_.get_value_or(L"");
std::wstring number_val;
_CP_OPT(bool) bool_val; _CP_OPT(bool) bool_val;
_CP_OPT(std::wstring) str_val; _CP_OPT(std::wstring) str_val;
std::wstring num_format = L""; std::wstring num_format;
size_t xfId_last_set = 0; size_t xfId_last_set = 0;
int empty_cell_count = 0; int empty_cell_count = 0;
bool skip_next_cell = false; bool skip_next_cell = false;
bool is_style_visible = true; bool is_style_visible = true;
bool is_data_visible = false; bool is_data_visible = false;
// вычислить стиль для ячейки
std::wstring cellStyleName = table_table_cell_attlist_.table_style_name_.get_value_or(L"");
std::wstring columnStyleName = Context.get_table_context().default_column_cell_style();
std::wstring rowStyleName = Context.get_table_context().default_row_cell_style();
// вычислить стиль для ячейки if (table_table_cell_attlist_.table_number_columns_repeated_ > 1)
odf_read_context & odfContext = Context.root()->odf_context(); columnStyleName.clear(); // могут быть разные стили колонок Book 24.ods
odf_read_context & odfContext = Context.root()->odf_context();
style_instance *defaultCellStyle=NULL, *defaultColumnCellStyle = NULL, *defaultRowCellStyle =NULL, *cellStyle = NULL; style_instance *defaultCellStyle=NULL, *defaultColumnCellStyle = NULL, *defaultRowCellStyle =NULL, *cellStyle = NULL;
try try
{ {
defaultCellStyle = odfContext.styleContainer().style_default_by_type(style_family::TableCell); defaultCellStyle = odfContext.styleContainer().style_default_by_type(style_family::TableCell);
defaultColumnCellStyle = odfContext.styleContainer().style_by_name(Context.get_table_context().default_column_cell_style(), style_family::TableCell,false);
defaultRowCellStyle = odfContext.styleContainer().style_by_name(Context.get_table_context().default_row_cell_style(), style_family::TableCell,false); defaultColumnCellStyle = odfContext.styleContainer().style_by_name(columnStyleName, style_family::TableCell, false);
defaultRowCellStyle = odfContext.styleContainer().style_by_name(rowStyleName, style_family::TableCell, false);
cellStyle = odfContext.styleContainer().style_by_name(styleName, style_family::TableCell, false); cellStyle = odfContext.styleContainer().style_by_name(cellStyleName, style_family::TableCell, false);
} }
catch(...) catch(...)
{ {
_CP_LOG << L"[error]: style wrong\n"; _CP_LOG << L"[error]: style wrong\n";
} }
std::wstring data_style = CalcCellDataStyle(Context, std::wstring data_style = CalcCellDataStyle(Context, columnStyleName, rowStyleName, cellStyleName);
Context.get_table_context().default_column_cell_style(),
Context.get_table_context().default_row_cell_style(),
styleName);
// стили не наследуются // стили не наследуются
std::vector<const style_instance *> instances; std::vector<const style_instance *> instances;
...@@ -733,8 +737,8 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context) ...@@ -733,8 +737,8 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
if (!data_style.empty()) if (!data_style.empty())
{ {
office_element_ptr elm = odfContext.numberStyles().find_by_style_name(data_style); office_element_ptr elm = odfContext.numberStyles().find_by_style_name(data_style);
number_style_base *num_style = dynamic_cast<number_style_base*>(elm.get()); number_style_base *num_style = dynamic_cast<number_style_base*>(elm.get());
if (num_style) if (num_style)
{ {
...@@ -751,10 +755,8 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context) ...@@ -751,10 +755,8 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
cellFormat.set_cell_type(t_val); cellFormat.set_cell_type(t_val);
cellFormat.set_num_format(oox::odf_string_to_build_in(odf_value_type)); cellFormat.set_num_format(oox::odf_string_to_build_in(odf_value_type));
is_style_visible = (styleName.length() > 0 || defaultColumnCellStyle) ? true : false; is_style_visible = (!cellStyleName.empty() || defaultColumnCellStyle) ? true : false;
xfId_last_set= Context.get_style_manager().xfId(&textFormatProperties, &parFormatProperties, &cellFormatProperties, &cellFormat, num_format, false, is_style_visible);
if ( table_table_cell_content_.elements_.size() > 0 || if ( table_table_cell_content_.elements_.size() > 0 ||
!formula.empty() || !formula.empty() ||
( t_val == oox::XlsxCellType::n && !number_val.empty()) || ( t_val == oox::XlsxCellType::n && !number_val.empty()) ||
...@@ -762,12 +764,26 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context) ...@@ -762,12 +764,26 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
(( t_val == oox::XlsxCellType::str || oox::XlsxCellType::inlineStr) && str_val)) is_data_visible = true; (( t_val == oox::XlsxCellType::str || oox::XlsxCellType::inlineStr) && str_val)) is_data_visible = true;
if (table_table_cell_attlist_.table_number_columns_repeated_ < 199 && last_cell_) last_cell_ = false; if (table_table_cell_attlist_.table_number_columns_repeated_ < 199 && last_cell_) last_cell_ = false;
int cell_repeated_max = Context.current_table_column() + table_table_cell_attlist_.table_number_columns_repeated_ + 1;
if (cell_repeated_max >= 1024 && cellStyleName.empty() && last_cell_ && !is_data_visible)
{//Book 24.ods
return;
}
if (is_style_visible)
{
xfId_last_set = Context.get_style_manager().xfId(&textFormatProperties, &parFormatProperties, &cellFormatProperties, &cellFormat, num_format, false, is_style_visible);
}
for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r) for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
{ {
Context.start_table_cell ( formula, table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1 , Context.start_table_cell ( formula, table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1 ,
table_table_cell_attlist_extra_.table_number_rows_spanned_ - 1 ); table_table_cell_attlist_extra_.table_number_rows_spanned_ - 1 );
Context.set_current_cell_style_id(xfId_last_set);
if (is_style_visible)
Context.set_current_cell_style_id(xfId_last_set);
const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, &textFormatProperties); const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, &textFormatProperties);
......
X2tConverter/build/Qt/X2tConverter.pri
View file @ 4c12ba9c
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.410 VERSION = 2.0.2.411
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TARGET = x2t 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7