Skip to content

O
onlyoffice_core
Commit 326c8f5d authored by ElenaSubbotina's avatar ElenaSubbotina Committed by Alexander Trofimov
Browse files
Options

OdfFormatReader - поправлена конвертация формул в Vehicle log book.ods

parent 15cf0894
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 107 deletions
ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
View file @ 326c8f5d
...@@ -7,95 +7,129 @@ ...@@ -7,95 +7,129 @@
namespace cpdoccore { namespace cpdoccore {
namespace formulasconvert { namespace formulasconvert {
class odf2oox_converter::Impl class odf2oox_converter::Impl
{
public:
std::wstring convert(const std::wstring& expr);
std::wstring convert_chart_distance(const std::wstring& expr);
void replace_cells_range(std::wstring& expr);
bool check_formula(std::wstring& expr);
void replace_semicolons(std::wstring& expr);
void replace_vertical(std::wstring& expr);
void replace_space(std::wstring& expr);
void replace_named_ref(std::wstring & expr);
bool find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref);
bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
};
bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
{
std::vector< std::wstring > splitted;
boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
if (splitted.size()==3)
{ {
table = splitted[0]; public:
ref_first = splitted[1]; std::wstring convert(const std::wstring& expr);
ref_last = splitted[2]; std::wstring convert_chart_distance(const std::wstring& expr);
return true; void replace_cells_range(std::wstring& expr);
bool check_formula(std::wstring& expr);
void replace_semicolons(std::wstring& expr);
void replace_vertical(std::wstring& expr);
void replace_space(std::wstring& expr);
void replace_named_ref(std::wstring & expr);
bool find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref);
bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
};
bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
{
std::vector< std::wstring > splitted;
boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
if (splitted.size()==3)
{
table = splitted[0];
ref_first = splitted[1];
ref_last = splitted[2];
return true;
}
if (splitted.size()==4)
{
table = splitted[0];
ref_first = splitted[1];
ref_last = splitted[3];
return true;
}
return false;
} }
if (splitted.size()==4)
bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
{ {
table = splitted[0]; boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
ref_first = splitted[1]; boost::wsmatch result;
ref_last = splitted[3]; bool b = boost::regex_search(expr, result, re);
return true;
size_t sz = result.size();
if (sz == 4 && !result[1].matched)
{
table = L"";
ref = result[2].str();
return true;
}
else if (sz == 4 && result[1].matched)
{
table = result[1].str();
boost::algorithm::replace_all(table, L"$", L"");
boost::algorithm::replace_all(table, L"'", L"");
ref = result[2].str();
return true;
}
return false;
} }
return false;
}
bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref) std::wstring replace_cell_range_formater(boost::wsmatch const & what)
{ {
boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]"); const size_t sz = what.size();
boost::wsmatch result; if (sz == 4 && !what[1].matched)
bool b = boost::regex_search(expr, result, re); {
const std::wstring c1 = what[2].str();
const std::wstring c2 = what[3].str();
const std::wstring s = c1 + (c2.empty() ? L"" : (L":" + c2) );
return s;
}
else if (sz == 4 && what[1].matched)
{
std::wstring sheet1 = what[1].str();
boost::algorithm::replace_all(sheet1, L"$", L"");
const std::wstring c1 = what[2].str();
std::wstring c2 = what[3].str();
if (c2.empty()) c2 = what[4].str();
const std::wstring s = sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
return s;
}
return L"";
}
size_t sz = result.size(); std::wstring replace_named_ref_formater(boost::wsmatch const & what)
if (sz == 4 && !result[1].matched) {
{ const size_t sz = what.size();
table = L"";
ref = result[2].str();
return true;
}
else if (sz == 4 && result[1].matched)
{
table = result[1].str();
boost::algorithm::replace_all(table, L"$", L"");
boost::algorithm::replace_all(table, L"'", L"");
ref = result[2].str();
return true;
}
return false;
}
namespace if (sz == 4 && !what[1].matched)
{ {
const std::wstring c1 = what[2].str();
const std::wstring c2 = what[3].str();
const std::wstring s = c1 + (c2.empty() ? L"" : (L":" + c2) );
return s;
}
else if (sz == 4 && what[1].matched)
{
std::wstring sheet1 = what[1].str();
boost::algorithm::replace_all(sheet1, L"$", L"");
std::wstring replace_cell_range_formater(boost::wsmatch const & what) const std::wstring c1 = what[2].str();
{ const std::wstring c2 = what[3].str();
const size_t sz = what.size(); const std::wstring s = sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
if (sz == 4 && !what[1].matched) return s;
{ }
const std::wstring c1 = what[2].str(); return L"";
const std::wstring c2 = what[3].str(); }
const std::wstring s = c1 + (c2.empty() ? L"" : (L":" + c2) ); std::wstring replace_named_ref_formater1(boost::wsmatch const & what)
return s; {
} boost::wregex complexRef(L"\\$([^\\.]+?){0,1}\\.(\\$[a-zA-Z]+\\$\\d+)(?::\\.(\\$[a-zA-Z]+\\$\\d+)){0,1}");
else if (sz == 4 && what[1].matched)
{
std::wstring sheet1 = what[1].str();
boost::algorithm::replace_all(sheet1, L"$", L"");
const std::wstring c1 = what[2].str(); std::wstring expr = what[1].str();
const std::wstring c2 = what[3].str(); const std::wstring res = boost::regex_replace(
const std::wstring s = sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) ); expr,
return s; complexRef,
} &replace_named_ref_formater,
return L""; boost::match_default | boost::format_all);
} expr = res;
} return expr;
}
// çàìåíÿåì ôîðìàò àäðåñàöèè ÿ÷ååê // çàìåíÿåì ôîðìàò àäðåñàöèè ÿ÷ååê
...@@ -107,7 +141,8 @@ std::wstring replace_cell_range_formater(boost::wsmatch const & what) ...@@ -107,7 +141,8 @@ std::wstring replace_cell_range_formater(boost::wsmatch const & what)
void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr) void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr)
{ {
//boost::wregex simpleRef(L"\\[\\.([a-zA-Z]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]"); //boost::wregex simpleRef(L"\\[\\.([a-zA-Z]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]"); //boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
boost::wregex complexRef(L"\\[(.*?)\\]");
/* /*
[ $ Sheet2 . A1 : . B5 ] [ $ Sheet2 . A1 : . B5 ]
...@@ -116,38 +151,13 @@ void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr) ...@@ -116,38 +151,13 @@ void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr)
const std::wstring res = boost::regex_replace( const std::wstring res = boost::regex_replace(
expr, expr,
complexRef, complexRef,
&replace_cell_range_formater, &replace_named_ref_formater1,
boost::match_default | boost::format_all); boost::match_default | boost::format_all);
expr = res; expr = res;
} }
namespace {
std::wstring replace_named_ref_formater(boost::wsmatch const & what)
{
const size_t sz = what.size();
if (sz == 4 && !what[1].matched)
{
const std::wstring c1 = what[2].str();
const std::wstring c2 = what[3].str();
const std::wstring s = c1 + (c2.empty() ? L"" : (L":" + c2) );
return s;
}
else if (sz == 4 && what[1].matched)
{
std::wstring sheet1 = what[1].str();
boost::algorithm::replace_all(sheet1, L"$", L"");
const std::wstring c1 = what[2].str();
const std::wstring c2 = what[3].str();
const std::wstring s = sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
return s;
}
return L"";
}
}
void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr) void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr)
{ {
boost::wregex complexRef(L"\\$([^\\.]+?){0,1}\\.(\\$[a-zA-Z]+\\$\\d+)(?::\\.(\\$[a-zA-Z]+\\$\\d+)){0,1}"); boost::wregex complexRef(L"\\$([^\\.]+?){0,1}\\.(\\$[a-zA-Z]+\\$\\d+)(?::\\.(\\$[a-zA-Z]+\\$\\d+)){0,1}");
...@@ -289,9 +299,14 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr) ...@@ -289,9 +299,14 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr)
{ {
if (is_forbidden(expr)) if (is_forbidden(expr))
return L"NULLFORMULA()"; return L"NULLFORMULA()";
std::wstring workstr = expr; std::wstring workstr = expr;
check_formula(workstr);
boost::algorithm::replace_all(workstr, L" ", L"PROBEL");
boost::algorithm::replace_all(workstr, L"'", L"APOSTROF");
check_formula(workstr);
replace_cells_range(workstr); replace_cells_range(workstr);
replace_semicolons(workstr); replace_semicolons(workstr);
replace_vertical(workstr); replace_vertical(workstr);
...@@ -303,6 +318,8 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr) ...@@ -303,6 +318,8 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr)
//todooo //todooo
} }
boost::algorithm::replace_all(workstr, L"PROBEL", L" ");
boost::algorithm::replace_all(workstr, L"APOSTROF", L"'");
return workstr; return workstr;
} }
......
ASCOfficeOdfFile/src/docx/oox_types_chart.cpp
View file @ 326c8f5d
...@@ -285,6 +285,8 @@ void oox_doughnut_chart::set_properties(std::vector<odf_reader::_property> g) ...@@ -285,6 +285,8 @@ void oox_doughnut_chart::set_properties(std::vector<odf_reader::_property> g)
} }
void oox_doughnut_chart::oox_serialize(std::wostream & _Wostream) void oox_doughnut_chart::oox_serialize(std::wostream & _Wostream)
{ {
grouping_.clear();
CP_XML_WRITER(_Wostream) CP_XML_WRITER(_Wostream)
{ {
CP_XML_NODE(L"c:doughnutChart") CP_XML_NODE(L"c:doughnutChart")
......
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