Skip to content

O
onlyoffice_core
Commit 62fbef9f authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

to commit 076de8bb

parent 076de8bb
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 22 deletions
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
View file @ 62fbef9f
...@@ -801,23 +801,32 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorkbookView *oox_book_views) ...@@ -801,23 +801,32 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorkbookView *oox_book_views)
} }
} }
} }
if (oox_book_views->m_oShowSheetTabs.IsInit())
{
ods_context->settings_context()->add_property(L"HasSheetTabs", L"boolean", oox_book_views->m_oShowSheetTabs->ToBool() ? L"true" : L"false");
}
if ((oox_book_views->m_oShowHorizontalScroll.IsInit()) && (oox_book_views->m_oShowHorizontalScroll->ToBool()==false))
{
ods_context->settings_context()->add_property(L"HorizontalScrollbarWidth", L"int", L"0");
}
if ((oox_book_views->m_oShowVerticalScroll.IsInit()) && (oox_book_views->m_oShowVerticalScroll->ToBool()==false))
{
ods_context->settings_context()->add_property(L"VerticalScrollbarWidth", L"int", L"0");
}
ods_context->settings_context()->add_property(L"ZoomType", L"short", L"0"); ods_context->settings_context()->add_property(L"ZoomType", L"short", L"0");
ods_context->settings_context()->add_property(L"ZoomValue", L"int", L"100"); ods_context->settings_context()->add_property(L"ZoomValue", L"int", L"100");
ods_context->settings_context()->end_view(); ods_context->settings_context()->end_view();
//nullable<SimpleTypes::COnOff<>> m_oAutoFilterDateGrouping; //nullable<SimpleTypes::COnOff<>> m_oAutoFilterDateGrouping;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oFirstSheet; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oFirstSheet;
//nullable<SimpleTypes::COnOff<>> m_oMinimized; //nullable<SimpleTypes::COnOff<>> m_oMinimized;
//nullable<SimpleTypes::COnOff<>> m_oShowHorizontalScroll; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oTabRatio;
//nullable<SimpleTypes::COnOff<>> m_oShowSheetTabs; //nullable<SimpleTypes::Spreadsheet::CVisibleType<>> m_oVisibility;
//nullable<SimpleTypes::COnOff<>> m_oShowVerticalScroll; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oWindowHeight;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oTabRatio; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oWindowWidth;
//nullable<SimpleTypes::Spreadsheet::CVisibleType<>> m_oVisibility; //nullable<SimpleTypes::CDecimalNumber<>> m_oXWindow;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oWindowHeight; //nullable<SimpleTypes::CDecimalNumber<>> m_oYWindow;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oWindowWidth;
//nullable<SimpleTypes::CDecimalNumber<>> m_oXWindow;
//nullable<SimpleTypes::CDecimalNumber<>> m_oYWindow;
} }
void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views) void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
...@@ -903,26 +912,43 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views) ...@@ -903,26 +912,43 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
ods_context->settings_context()->add_property(L"PositionBottom", L"int", sVal); ods_context->settings_context()->add_property(L"PositionBottom", L"int", sVal);
} }
} }
if (oox_sheet_views->m_arrItems[i]->m_oShowRowColHeaders.IsInit())
{
ods_context->settings_context()->add_property(L"HasColumnRowHeaders", L"boolean", oox_sheet_views->m_arrItems[i]->m_oShowRowColHeaders->ToBool() ? L"true" : L"false");
}
//if (oox_sheet_views->m_arrItems[i]->m_oTabSelected.IsInit())
//{
// ods_context->settings_context()->add_property(L"HasSheetTabs", "boolean", oox_sheet_views->m_arrItems[i]->m_oTabSelected->ToBool() ? L"true", L"false");
//}
//if (oox_sheet_views->m_arrItems[i]->m_oShowFormulas.IsInit())
//{
// ods_context->settings_context()->add_property(L"ShowFormulas", "boolean", oox_sheet_views->m_arrItems[i]->m_oShowFormulas->ToBool() ? L"true", L"false");
//}
if (oox_sheet_views->m_arrItems[i]->m_oShowOutlineSymbols.IsInit())
{
ods_context->settings_context()->add_property(L"IsOutlineSymbolsSet", L"boolean", oox_sheet_views->m_arrItems[i]->m_oShowOutlineSymbols->ToBool() ? L"true" : L"false");
}
if (oox_sheet_views->m_arrItems[i]->m_oShowZeros.IsInit())
{
ods_context->settings_context()->add_property(L"ShowZeroValues", L"boolean", oox_sheet_views->m_arrItems[i]->m_oShowZeros->ToBool() ? L"true" : L"false");
}
if (oox_sheet_views->m_arrItems[i]->m_oZoomScalePageLayoutView.IsInit())
{
ods_context->settings_context()->add_property(L"PageViewZoomValue", L"int", oox_sheet_views->m_arrItems[i]->m_oZoomScalePageLayoutView->ToString().GetBuffer());
}
//nullable<SimpleTypes::COnOff<>> m_oDefaultGridColor; //nullable<SimpleTypes::COnOff<>> m_oDefaultGridColor;
//nullable<SimpleTypes::COnOff<>> m_oShowFormulas;
//nullable<SimpleTypes::COnOff<>> m_oShowOutlineSymbols;
//nullable<SimpleTypes::COnOff<>> m_oShowRowColHeaders;
//nullable<SimpleTypes::COnOff<>> m_oShowRuler; //nullable<SimpleTypes::COnOff<>> m_oShowRuler;
//nullable<SimpleTypes::COnOff<>> m_oShowWhiteSpace; //nullable<SimpleTypes::COnOff<>> m_oShowWhiteSpace;
//nullable<SimpleTypes::COnOff<>> m_oShowZeros;
//nullable<SimpleTypes::COnOff<>> m_oTabSelected;
//nullable<CString> m_oTopLeftCell; //nullable<CString> m_oTopLeftCell;
//nullable<SimpleTypes::Spreadsheet::CSheetViewType<>>m_oView; //nullable<SimpleTypes::Spreadsheet::CSheetViewType<>> m_oView;
//nullable<SimpleTypes::COnOff<>> m_oWindowProtection; //nullable<SimpleTypes::COnOff<>> m_oWindowProtection;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oWorkbookViewId;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oZoomScaleNormal; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oZoomScaleNormal;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oZoomScalePageLayoutView;
//nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oZoomScaleSheetLayoutView; //nullable<SimpleTypes::CUnsignedDecimalNumber<>> m_oZoomScaleSheetLayoutView;
ods_context->end_table_view(); ods_context->end_table_view();
} }
} }
void XlsxConverter::convert(OOX::Spreadsheet::CPageSetup *oox_page) void XlsxConverter::convert(OOX::Spreadsheet::CPageSetup *oox_page)
{ {
if (!oox_page) return; if (!oox_page) return;
......
Common/DocxFormat/Source/XlsxFormat/Worksheets/WorksheetChildOther.h
View file @ 62fbef9f
...@@ -512,7 +512,7 @@ namespace OOX ...@@ -512,7 +512,7 @@ namespace OOX
} }
if (m_oActiveCellId.IsInit()) if (m_oActiveCellId.IsInit())
{ {
CString sVal; sVal.Format(_T(" activeCellId=\"%d\""), m_oActiveCellId.get()); CString sVal; sVal.Format(_T(" activeCellId=\"%d\""), m_oActiveCellId->GetValue());
writer.WriteString(sVal); writer.WriteString(sVal);
} }
if (m_oSqref.IsInit()) if (m_oSqref.IsInit())
......
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