Skip to content

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

неокторые забывашки из стилей таблиц 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56173 954022d7-b5bf-4e40-9824-e11837661b57
parent e43de8bc
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 9 deletions
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
View file @ 41c9ea5c
...@@ -497,12 +497,13 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCol *oox_column) ...@@ -497,12 +497,13 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCol *oox_column)
} }
else if (oox_column->m_oCustomWidth.IsInit() == false || else if (oox_column->m_oCustomWidth.IsInit() == false ||
(oox_column->m_oCustomWidth.IsInit() == true && oox_column->m_oCustomWidth->GetValue() == 1)) (oox_column->m_oCustomWidth.IsInit() == true && oox_column->m_oCustomWidth->GetValue() == 1))
{
ods_context->current_table().set_column_optimal_width(false);
}
if (width > 0 )
{ {
width = ods_context->convert_symbol_width(width); width = ods_context->convert_symbol_width(width);
ods_context->current_table().set_column_width(width); ods_context->current_table().set_column_width(width);
ods_context->current_table().set_column_optimal_width(false);
// !!!
//???
} }
std::wstring style_cell_name; std::wstring style_cell_name;
...@@ -745,6 +746,76 @@ void XlsxConverter::convert(OOX::Spreadsheet::CNumFmt *numFmt) ...@@ -745,6 +746,76 @@ void XlsxConverter::convert(OOX::Spreadsheet::CNumFmt *numFmt)
ods_context->numbers_styles_context()->add_or_find(numFmt->m_oNumFmtId->GetValue(), string2std_string(numFmt->m_oFormatCode.get())); ods_context->numbers_styles_context()->add_or_find(numFmt->m_oNumFmtId->GetValue(), string2std_string(numFmt->m_oFormatCode.get()));
} }
} }
void XlsxConverter::convert(OOX::Spreadsheet::CAligment *aligment, odf::style_paragraph_properties * paragraph_properties
, odf::style_table_cell_properties * cell_properties)
{
if (!aligment)return;
if (aligment->m_oVertical.IsInit())
{
switch(aligment->m_oVertical->GetValue())
{
case SimpleTypes::Spreadsheet::verticalalignmentBottom: paragraph_properties->content().style_vertical_align_ =
odf::vertical_align(odf::vertical_align::Bottom); break;
case SimpleTypes::Spreadsheet::verticalalignmentCenter: paragraph_properties->content().style_vertical_align_ =
odf::vertical_align(odf::vertical_align::Middle); break;
case SimpleTypes::Spreadsheet::verticalalignmentDistributed: paragraph_properties->content().style_vertical_align_ =
odf::vertical_align(odf::vertical_align::Auto); break;
case SimpleTypes::Spreadsheet::verticalalignmentJustify: paragraph_properties->content().style_vertical_align_ =
odf::vertical_align(odf::vertical_align::Justify); break;
case SimpleTypes::Spreadsheet::verticalalignmentTop: paragraph_properties->content().style_vertical_align_ =
odf::vertical_align(odf::vertical_align::Top); break;
}
if (paragraph_properties->content().style_vertical_align_)
cell_properties->style_table_cell_properties_attlist_.style_vertical_align_ = paragraph_properties->content().style_vertical_align_;
}
if (aligment->m_oTextRotation.IsInit())
{
cell_properties->style_table_cell_properties_attlist_.common_rotation_angle_attlist_.style_rotation_angle_ = aligment->m_oTextRotation->GetValue();
cell_properties->style_table_cell_properties_attlist_.style_rotation_align_= odf::rotation_align(odf::rotation_align::Bottom);
}
if(aligment->m_oHorizontal.IsInit())
{
switch(aligment->m_oHorizontal->GetValue())
{
case SimpleTypes::Spreadsheet::horizontalalignmentCenter: paragraph_properties->content().fo_text_align_ =
odf::text_align(odf::text_align::Center); break;
//case SimpleTypes::Spreadsheet::horizontalalignmentContinuous: paragraph_properties->content().fo_text_align_ =
// odf::text_align(odf::text_align::Left); break;
//case SimpleTypes::Spreadsheet::horizontalalignmentDistributed: paragraph_properties->content().fo_text_align_ =
// odf::text_align(odf::text_align::Left); break;
case SimpleTypes::Spreadsheet::horizontalalignmentFill: paragraph_properties->content().fo_text_align_ =
odf::text_align(odf::text_align::Left); break;
//case SimpleTypes::Spreadsheet::horizontalalignmentGeneral: paragraph_properties->content().fo_text_align_ =
// odf::text_align(odf::text_align::Left); break;
case SimpleTypes::Spreadsheet::horizontalalignmentJustify: paragraph_properties->content().fo_text_align_ =
odf::text_align(odf::text_align::Justify); break;
case SimpleTypes::Spreadsheet::horizontalalignmentLeft: paragraph_properties->content().fo_text_align_ =
odf::text_align(odf::text_align::Left); break;
case SimpleTypes::Spreadsheet::horizontalalignmentRight: paragraph_properties->content().fo_text_align_ =
odf::text_align(odf::text_align::Right); break;
}
}
if(aligment->m_oWrapText.IsInit())
{
if (aligment->m_oWrapText->GetValue())
cell_properties->style_table_cell_properties_attlist_.fo_wrap_option_ = odf::wrap_option(odf::wrap_option::Wrap);
else
cell_properties->style_table_cell_properties_attlist_.fo_wrap_option_ = odf::wrap_option(odf::wrap_option::NoWrap);
}
if(aligment->m_oShrinkToFit.IsInit())
{
cell_properties->style_table_cell_properties_attlist_.style_shrink_to_fit_ = aligment->m_oShrinkToFit->GetValue();
}
if (aligment->m_oIndent.IsInit())
{
}
//nullable<SimpleTypes::COnOff<>> m_oJustifyLastLine;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oReadingOrder;
//nullable<SimpleTypes::CDecimalNumber<>> m_oRelativeIndent;
}
void XlsxConverter::convert(OOX::Spreadsheet::CBorder *border, odf::style_table_cell_properties * cell_properties) void XlsxConverter::convert(OOX::Spreadsheet::CBorder *border, odf::style_table_cell_properties * cell_properties)
{ {
if (!border)return; if (!border)return;
...@@ -1010,7 +1081,11 @@ void XlsxConverter::convert(OOX::Spreadsheet::CXfs * xfc_style, int oox_id, bool ...@@ -1010,7 +1081,11 @@ void XlsxConverter::convert(OOX::Spreadsheet::CXfs * xfc_style, int oox_id, bool
{ {
convert(xlsx_styles->m_oBorders->m_arrItems[border_id], table_cell_properties); convert(xlsx_styles->m_oBorders->m_arrItems[border_id], table_cell_properties);
} }
if (xfc_style->m_oAligment.IsInit() && xfc_style->m_oApplyAlignment.IsInit())
{
odf::style_paragraph_properties * paragraph_properties = ods_context->styles_context()->last_state().get_paragraph_properties();
convert(xfc_style->m_oAligment.GetPointer(), paragraph_properties, table_cell_properties);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////
if (id_parent >=0) if (id_parent >=0)
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h
View file @ 41c9ea5c
...@@ -32,6 +32,7 @@ namespace OOX ...@@ -32,6 +32,7 @@ namespace OOX
class CFill; class CFill;
class CColor; class CColor;
class CBorderProp; class CBorderProp;
class CAligment;
class CXfs; class CXfs;
class CCellStyle; class CCellStyle;
class CNumFmt; class CNumFmt;
...@@ -130,8 +131,10 @@ namespace Oox2Odf ...@@ -130,8 +131,10 @@ namespace Oox2Odf
void convert(OOX::Spreadsheet::CFill *fill, odf::style_table_cell_properties *cell_properties); void convert(OOX::Spreadsheet::CFill *fill, odf::style_table_cell_properties *cell_properties);
void convert(OOX::Spreadsheet::CColor *color, _CP_OPT(odf::color) & odf_color); void convert(OOX::Spreadsheet::CColor *color, _CP_OPT(odf::color) & odf_color);
void convert(OOX::Spreadsheet::CColor *color, _CP_OPT(odf::background_color) & odf_bckgrd_color); void convert(OOX::Spreadsheet::CColor *color, _CP_OPT(odf::background_color) & odf_bckgrd_color);
void convert(OOX::Spreadsheet::CBorderProp *borderProp, std::wstring & odf_border_prop); void convert(OOX::Spreadsheet::CBorderProp *borderProp, std::wstring & odf_border_prop);
void convert(OOX::Spreadsheet::CAligment *aligment, odf::style_paragraph_properties * paragraph_properties,
odf::style_table_cell_properties * cell_properties);
void convert(OOX::Spreadsheet::CXfs *cell_style, int oox_id, bool automatic=true, bool root = false); void convert(OOX::Spreadsheet::CXfs *cell_style, int oox_id, bool automatic=true, bool root = false);
void convert(OOX::Spreadsheet::CCellStyle *cell_style, int oox_id); void convert(OOX::Spreadsheet::CCellStyle *cell_style, int oox_id);
......
ASCOfficeOdfFileW/version.h
View file @ 41c9ea5c
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
//1 //1
//2 //2
//0 //0
//41 //42
#define INTVER 1,2,0,41 #define INTVER 1,2,0,42
#define STRVER "1,2,0,41\0" #define STRVER "1,2,0,42\0"
Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h
View file @ 41c9ea5c
...@@ -723,7 +723,7 @@ namespace SimpleTypes ...@@ -723,7 +723,7 @@ namespace SimpleTypes
} }
SimpleType_FromString (EVerticalAlignment) SimpleType_FromString (EVerticalAlignment)
SimpleType_Operator_Equal (CVerticalAlignment) SimpleType_Operator_Equal (CVerticalAlignment)
}; };
enum EGradientType enum EGradientType
{ {
......
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