Skip to content

O
onlyoffice_core
Commit 2d2d6461 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

OdfFile убран конфликт с библиотекой х11 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63253 954022d7-b5bf-4e40-9824-e11837661b57
parent 08be49c9
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 18 deletions
ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp
View file @ 2d2d6461
......@@ -82,7 +82,7 @@ xlsx_font OdfFont2XlsxFont(const odf_reader::text_format_properties_content * te
}
if (textProp->style_text_underline_type_ &&
textProp->style_text_underline_type_->get_type() != odf_types::line_type::None ||
textProp->style_text_underline_type_->get_type() != odf_types::line_type::Non ||
textProp->style_text_underline_style_ &&
textProp->style_text_underline_style_->get_type() != odf_types::line_style::None
......@@ -96,7 +96,7 @@ xlsx_font OdfFont2XlsxFont(const odf_reader::text_format_properties_content * te
}
if (textProp->style_text_line_through_type_ &&
textProp->style_text_line_through_type_->get_type() != odf_types::line_type::None ||
textProp->style_text_line_through_type_->get_type() != odf_types::line_type::Non ||
textProp->style_text_line_through_style_ &&
textProp->style_text_line_through_style_->get_type() != odf_types::line_style::None)
......
ASCOfficeOdfFile/src/odf/datatypes/linetype.cpp
View file @ 2d2d6461
......@@ -9,7 +9,7 @@ std::wostream & operator << (std::wostream & _Wostream, const line_type & _Val)
{
switch(_Val.get_type())
{
case line_type::None:
case line_type::Non:
_Wostream << "none";
break;
case line_type::Single:
......@@ -30,7 +30,7 @@ line_type line_type::parse(const std::wstring & Str)
boost::algorithm::to_lower(tmp);
if (tmp == L"none")
return line_type( None );
return line_type( Non );
else if (tmp == L"single")
return line_type( Single );
else if (tmp == L"double")
......@@ -38,7 +38,7 @@ line_type line_type::parse(const std::wstring & Str)
else
{
BOOST_THROW_EXCEPTION( errors::invalid_attribute() );
return None;
return Non;
}
}
......
ASCOfficeOdfFile/src/odf/datatypes/linetype.h
View file @ 2d2d6461
......@@ -17,7 +17,7 @@ class line_type
public:
enum type
{
None,
Non,
Single,
Double
};
......
ASCOfficeOdfFile/src/odf/style_paragraph_properties_docx.cpp
View file @ 2d2d6461
......@@ -432,14 +432,14 @@ void style_tab_stop::docx_convert(oox::docx_conversion_context & Context)
{
std::wstring leader;
if (style_leader_type_ && style_leader_type_->get_type() == line_type::None ||
if (style_leader_type_ && style_leader_type_->get_type() == line_type::Non ||
style_leader_style_ && style_leader_style_->get_type() == line_style::None)
{
leader = L"none";
}
else if (
!style_leader_type_ ||
style_leader_type_ && style_leader_type_->get_type() != line_type::None
style_leader_type_ && style_leader_type_->get_type() != line_type::Non
)
{
if (style_leader_style_)
......
ASCOfficeOdfFile/src/odf/style_text_properties.cpp
View file @ 2d2d6461
......@@ -410,7 +410,7 @@ void text_format_properties_content::pptx_convert(oox::pptx_conversion_context &
under.get_type() == line_width::Thick;
std::wstring underline = L"";
if ( style_text_underline_type_ && style_text_underline_type_->get_type() == line_type::None ||
if ( style_text_underline_type_ && style_text_underline_type_->get_type() == line_type::Non ||
style_text_underline_style_ && style_text_underline_style_->get_type() == line_style::None
)
{
......@@ -680,7 +680,7 @@ void text_format_properties_content::docx_convert(oox::docx_conversion_context &
under.get_type() == line_width::Thick;
std::wstring underline = L"";
if ( style_text_underline_type_ && style_text_underline_type_->get_type() == line_type::None ||
if ( style_text_underline_type_ && style_text_underline_type_->get_type() == line_type::Non ||
style_text_underline_style_ && style_text_underline_style_->get_type() == line_style::None
)
{
......@@ -772,7 +772,7 @@ void text_format_properties_content::docx_convert(oox::docx_conversion_context &
// 17.3.2.9
// 17.3.2.37
{
if (style_text_line_through_type_ && style_text_line_through_type_->get_type() == line_type::None ||
if (style_text_line_through_type_ && style_text_line_through_type_->get_type() == line_type::Non ||
style_text_line_through_style_ && style_text_line_through_style_->get_type() == line_style::None
)
{
......
ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.cpp
View file @ 2d2d6461
......@@ -260,7 +260,7 @@ void odf_conversion_context::add_tab(_CP_OPT(int) type, _CP_OPT(length) _length,
case 3: tab->style_leader_type_ = line_type::Single ;
tab->style_leader_style_= line_style::LongDash;
break; // tabtlcMiddleDot = 3,
case 4: tab->style_leader_type_ = line_type::None;
case 4: tab->style_leader_type_ = line_type::Non;
break; // tabtlcNone = 4,
case 5: tab->style_leader_type_ = line_type::Single;
tab->style_leader_style_= line_style::Solid;
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp
View file @ 2d2d6461
......@@ -21,6 +21,10 @@
#include "../../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
#include "../../../Common/DocxFormat/Source/DocxFormat/Docx.h"
#ifdef __linux__
#include "X11/Xlib.h"
#endif
#define PROGRESSEVENT_ID 0
namespace Oox2Odf
......@@ -1234,7 +1238,7 @@ void OoxConverter::convert(OOX::Drawing::CRunProperty * oox_run_pr, odf_writer::
switch(type)
{
case SimpleTypes::underlineNone :
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::None);break;
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Non);break;
case SimpleTypes::underlineDash :
case SimpleTypes::underlineDashedHeavy:
text_properties->content().style_text_underline_style_ = odf_types::line_style(odf_types::line_style::Dash);break;
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @ 2d2d6461
......@@ -1551,7 +1551,7 @@ void DocxConverter::convert(OOX::Logic::CRunProperty *oox_run_pr, odf_writer::st
convert(oox_run_pr->m_oColor.GetPointer(),text_properties->content().fo_color_);
}
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::None);
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Non);
if (oox_run_pr->m_oU.IsInit())
{
text_properties->content().style_text_underline_style_ = odf_types::line_style(odf_types::line_style::Solid);
......@@ -1575,7 +1575,7 @@ void DocxConverter::convert(OOX::Logic::CRunProperty *oox_run_pr, odf_writer::st
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Double);break;
case SimpleTypes::underlineNone :
{
text_properties->content().style_text_underline_type_ = odf_types::line_type(odf_types::line_type::None);
text_properties->content().style_text_underline_type_ = odf_types::line_type(odf_types::line_type::Non);
text_properties->content().style_text_underline_style_ = boost::none;
text_properties->content().style_text_underline_color_ = boost::none;
}break;
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
View file @ 2d2d6461
......@@ -564,7 +564,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRPr *oox_run_pr)
}
convert(oox_run_pr->m_oColor.GetPointer(),text_properties->content().fo_color_);
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::None);
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Non);
if (oox_run_pr->m_oUnderline.IsInit())
{
text_properties->content().style_text_underline_style_ = odf_types::line_style(odf_types::line_style::Solid);
......@@ -580,7 +580,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRPr *oox_run_pr)
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Double);break;
case SimpleTypes::Spreadsheet::underlineNone :
text_properties->content().style_text_underline_style_ = boost::none;
text_properties->content().style_text_underline_type_ = odf_types::line_type(odf_types::line_type::None);break;
text_properties->content().style_text_underline_type_ = odf_types::line_type(odf_types::line_type::Non);break;
case SimpleTypes::Spreadsheet::underlineSingle :
case SimpleTypes::Spreadsheet::underlineSingleAccounting :
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Single);break;
......@@ -974,7 +974,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CFont * font, odf_writer::style_te
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Double);break;
case SimpleTypes::Spreadsheet::underlineNone :
text_properties->content().style_text_underline_style_ = boost::none;
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::None);break;
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Non);break;
case SimpleTypes::Spreadsheet::underlineSingle :
case SimpleTypes::Spreadsheet::underlineSingleAccounting :
text_properties->content().style_text_underline_type_= odf_types::line_type(odf_types::line_type::Single);break;
......
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