Commit 91b1dad7 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent e4d043c1
...@@ -244,7 +244,7 @@ std::wstring replace_space_PROBEL(boost::wsmatch const & what) ...@@ -244,7 +244,7 @@ std::wstring replace_space_PROBEL(boost::wsmatch const & what)
else if (what[3].matched) else if (what[3].matched)
return what[3].str(); return what[3].str();
} }
std::wstring replace_point_ТОСHKA(boost::wsmatch const & what) std::wstring replace_point(boost::wsmatch const & what)
{ {
if (what[1].matched) if (what[1].matched)
{ {
...@@ -329,7 +329,7 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr) ...@@ -329,7 +329,7 @@ std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr)
std::wstring workstr = boost::regex_replace( std::wstring workstr = boost::regex_replace(
expr, expr,
complexRef, complexRef,
&replace_point_ТОСHKA, &replace_point,
boost::match_default | boost::format_all); boost::match_default | boost::format_all);
boost::algorithm::replace_all(workstr, L" ", L"PROBEL"); boost::algorithm::replace_all(workstr, L" ", L"PROBEL");
...@@ -443,7 +443,7 @@ std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr) ...@@ -443,7 +443,7 @@ std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr)
std::wstring workstr = boost::regex_replace( std::wstring workstr = boost::regex_replace(
expr, expr,
complexRef, complexRef,
&replace_point_ТОСHKA, &replace_point,
boost::match_default | boost::format_all); boost::match_default | boost::format_all);
boost::algorithm::replace_all(workstr, L" ", L"PROBEL"); boost::algorithm::replace_all(workstr, L" ", L"PROBEL");
...@@ -463,7 +463,7 @@ std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr) ...@@ -463,7 +463,7 @@ std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr)
std::wstring workstr = boost::regex_replace( std::wstring workstr = boost::regex_replace(
expr, expr,
complexRef, complexRef,
&replace_point_ТОСHKA, &replace_point,
boost::match_default | boost::format_all); boost::match_default | boost::format_all);
boost::algorithm::replace_all(workstr, L" ", L"PROBEL"); boost::algorithm::replace_all(workstr, L" ", L"PROBEL");
......
...@@ -343,14 +343,14 @@ SOURCES += \ ...@@ -343,14 +343,14 @@ SOURCES += \
} }
SOURCES += \ SOURCES += \
../formulasconvert/formulasconvert_odf.cpp \
../formulasconvert/formulasconvert_oox.cpp \ ../formulasconvert/formulasconvert_oox.cpp \
../src/odf/math_elementaries.cpp \ ../src/odf/math_elementaries.cpp \
../src/odf/math_layout_elements.cpp \ ../src/odf/math_layout_elements.cpp \
../src/odf/math_limit_elements.cpp \ ../src/odf/math_limit_elements.cpp \
../src/odf/math_table_elements.cpp \ ../src/odf/math_table_elements.cpp \
../src/odf/math_token_elements.cpp \ ../src/odf/math_token_elements.cpp \
../src/odf/datatypes/mathvariant.cpp ../src/odf/datatypes/mathvariant.cpp \
../formulasconvert/formulasconvert_odf.cpp
HEADERS += \ HEADERS += \
../formulasconvert/formulasconvert.h \ ../formulasconvert/formulasconvert.h \
......
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