sc/source/filter/inc/workbooksettings.hxx | 14 ----------- sc/source/filter/oox/workbooksettings.cxx | 38 ------------------------------ unusedcode.easy | 7 ----- 3 files changed, 59 deletions(-)
New commits: commit 2283607f49146c8b1e6dd618d5fa1f89f7804797 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sun Apr 8 13:59:17 2012 +0200 Clean oox::xls::WorkbookSettings diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 07683d4..ed47d54 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -111,20 +111,6 @@ public: /** Sets the save external linked values flag, e.g. from the WSBOOL record. */ void setSaveExtLinkValues( bool bSaveExtLinks ); - /** Imports the CALCCOUNT record. */ - void importCalcCount( BiffInputStream& rStrm ); - /** Imports the CALCMODE record. */ - void importCalcMode( BiffInputStream& rStrm ); - /** Imports the DELTA record. */ - void importDelta( BiffInputStream& rStrm ); - /** Imports the ITERATION record. */ - void importIteration( BiffInputStream& rStrm ); - /** Imports the REFMODE record. */ - void importRefMode( BiffInputStream& rStrm ); - /** Imports the SAVERECALC record. */ - void importSaveRecalc( BiffInputStream& rStrm ); - /** Imports the UNCALCED record. */ - void importUncalced( BiffInputStream& rStrm ); /** Converts the imported workbook settings. */ void finalizeImport(); diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 0bdbf41..5d0048f 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -195,44 +195,6 @@ void WorkbookSettings::setSaveExtLinkValues( bool bSaveExtLinks ) maBookSettings.mbSaveExtLinkValues = bSaveExtLinks; } -void WorkbookSettings::importCalcCount( BiffInputStream& rStrm ) -{ - maCalcSettings.mnIterateCount = rStrm.readuInt16(); -} - -void WorkbookSettings::importCalcMode( BiffInputStream& rStrm ) -{ - sal_Int16 nCalcMode = rStrm.readInt16() + 1; - static const sal_Int32 spnCalcModes[] = { XML_autoNoTable, XML_manual, XML_auto }; - maCalcSettings.mnCalcMode = STATIC_ARRAY_SELECT( spnCalcModes, nCalcMode, XML_auto ); -} - -void WorkbookSettings::importDelta( BiffInputStream& rStrm ) -{ - rStrm >> maCalcSettings.mfIterateDelta; -} - -void WorkbookSettings::importIteration( BiffInputStream& rStrm ) -{ - maCalcSettings.mbIterate = rStrm.readuInt16() != 0; -} - -void WorkbookSettings::importRefMode( BiffInputStream& rStrm ) -{ - maCalcSettings.mnRefMode = (rStrm.readuInt16() == 0) ? XML_R1C1 : XML_A1; -} - -void WorkbookSettings::importSaveRecalc( BiffInputStream& rStrm ) -{ - maCalcSettings.mbCalcOnSave = rStrm.readuInt16() != 0; -} - -void WorkbookSettings::importUncalced( BiffInputStream& ) -{ - // existence of this record indicates incomplete recalc - maCalcSettings.mbCalcCompleted = false; -} - void WorkbookSettings::finalizeImport() { // default settings diff --git a/unusedcode.easy b/unusedcode.easy index 4fc0cb6..eb7fa0a 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -819,13 +819,6 @@ oox::xls::WorkbookGlobals::createBuffersPerSheet(short) oox::xls::WorkbookGlobals::setCodePage(unsigned short) oox::xls::WorkbookGlobals::setIsWorkbookFile() oox::xls::WorkbookHelper::setAppFontEncoding(unsigned short) -oox::xls::WorkbookSettings::importCalcCount(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importCalcMode(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importDelta(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importIteration(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importRefMode(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importSaveRecalc(oox::xls::BiffInputStream&) -oox::xls::WorkbookSettings::importUncalced(oox::xls::BiffInputStream&) oox::xls::WorksheetHelper::getBiffDrawing() const oox::xls::WorksheetHelper::setDefaultColumnFormat(int, int, int) oox::xls::WorksheetHelper::setLabelRanges(oox::xls::ApiCellRangeList const&, oox::xls::ApiCellRangeList const&) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits