[Libreoffice-commits] .: sc/source unusedcode.easy

[Julien Nabet]

 sc/source/filter/inc/worksheetsettings.hxx |   19 ------
 sc/source/filter/oox/worksheetsettings.cxx |   82 -----------------------------
 unusedcode.easy                            |    9 ---
 3 files changed, 110 deletions(-)

New commits:
commit b63afcd27df0eb7123782b7d80bc0963df9fedb9
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Apr 7 23:14:32 2012 +0200

    Clean oox::xls::WorksheetSettings

diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx
index 175c61d..26e8019 100644
--- a/sc/source/filter/inc/worksheetsettings.hxx
+++ b/sc/source/filter/inc/worksheetsettings.hxx
@@ -109,25 +109,6 @@ public:
     /** Imports phonetic settings from the PHONETICPR record. */
     void                importPhoneticPr( SequenceInputStream& rStrm );
 
-    /** Imports sheet properties from a SHEETEXT record. */
-    void                importSheetExt( BiffInputStream& rStrm );
-    /** Imports sheet properties from a SHEETPR record. */
-    void                importSheetPr( BiffInputStream& rStrm );
-    /** Imports protection status from the PROTECT record. */
-    void                importProtect( BiffInputStream& rStrm );
-    /** Imports object protection status from the OBJECTPROTECT record. */
-    void                importObjectProtect( BiffInputStream& rStrm );
-    /** Imports scenario protection status from the SCENPROTECT record. */
-    void                importScenProtect( BiffInputStream& rStrm );
-    /** Imports sheet password hash from the PASSWORD record. */
-    void                importPassword( BiffInputStream& rStrm );
-    /** Imports protection settings from the SHEETPROTECTION record. */
-    void                importSheetProtection( BiffInputStream& rStrm );
-    /** Imports the VBA code module name from the CODENAME record. */
-    void                importCodeName( BiffInputStream& rStrm );
-    /** Imports phonetic settings from the PHONETICPR record. */
-    void                importPhoneticPr( BiffInputStream& rStrm );
-
     /** Converts the imported worksheet settings. */
     void                finalizeImport();
 
diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index 768041b..3010aec 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -237,88 +237,6 @@ void WorksheetSettings::importPhoneticPr( SequenceInputStream& rStrm )
     maPhoneticSett.importPhoneticPr( rStrm );
 }
 
-void WorksheetSettings::importSheetExt( BiffInputStream& rStrm )
-{
-    rStrm.skip( 16 );
-    sal_uInt32 nFlags;
-    rStrm >> nFlags;
-    sal_uInt8 nColorIdx = extractValue< sal_uInt8 >( nFlags, 0, 7 );
-    if( nColorIdx != BIFF_SHEETEXT_NOTABCOLOR )
-        maSheetSettings.maTabColor.setPaletteClr( nColorIdx );
-}
-
-void WorksheetSettings::importSheetPr( BiffInputStream& rStrm )
-{
-    sal_uInt16 nFlags;
-    rStrm >> nFlags;
-    // worksheet vs. dialogsheet
-    if( getFlag( nFlags, BIFF_SHEETPR_DIALOGSHEET ) )
-    {
-        OSL_ENSURE( getSheetType() == SHEETTYPE_WORKSHEET, "WorksheetSettings::importSheetPr - unexpected sheet type" );
-        setSheetType( SHEETTYPE_DIALOGSHEET );
-    }
-    // outline settings
-    maSheetSettings.mbApplyStyles  = getFlag( nFlags, BIFF_SHEETPR_APPLYSTYLES );
-    maSheetSettings.mbSummaryRight = getFlag( nFlags, BIFF_SHEETPR_SYMBOLSRIGHT );
-    maSheetSettings.mbSummaryBelow = getFlag( nFlags, BIFF_SHEETPR_SYMBOLSBELOW );
-    // fit printout to width/height
-    getPageSettings().setFitToPagesMode( getFlag( nFlags, BIFF_SHEETPR_FITTOPAGES ) );
-    // save external linked values, in BIFF5-BIFF8 moved to BOOKBOOK record
-    if( getBiff() <= BIFF4 )
-        getWorkbookSettings().setSaveExtLinkValues( !getFlag( nFlags, BIFF_SHEETPR_SKIPEXT ) );
-}
-
-void WorksheetSettings::importProtect( BiffInputStream& rStrm )
-{
-    maSheetProt.mbSheet = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importObjectProtect( BiffInputStream& rStrm )
-{
-    maSheetProt.mbObjects = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importScenProtect( BiffInputStream& rStrm )
-{
-    maSheetProt.mbScenarios = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importPassword( BiffInputStream& rStrm )
-{
-    rStrm >> maSheetProt.mnPasswordHash;
-}
-
-void WorksheetSettings::importSheetProtection( BiffInputStream& rStrm )
-{
-    sal_uInt32 nFlags = rStrm.readuInt32();
-    // set flag means protection is disabled
-    maSheetProt.mbObjects          = !getFlag( nFlags, BIFF_SHEETPROT_OBJECTS );
-    maSheetProt.mbScenarios        = !getFlag( nFlags, BIFF_SHEETPROT_SCENARIOS );
-    maSheetProt.mbFormatCells      = !getFlag( nFlags, BIFF_SHEETPROT_FORMAT_CELLS );
-    maSheetProt.mbFormatColumns    = !getFlag( nFlags, BIFF_SHEETPROT_FORMAT_COLUMNS );
-    maSheetProt.mbFormatRows       = !getFlag( nFlags, BIFF_SHEETPROT_FORMAT_ROWS );
-    maSheetProt.mbInsertColumns    = !getFlag( nFlags, BIFF_SHEETPROT_INSERT_COLUMNS );
-    maSheetProt.mbInsertRows       = !getFlag( nFlags, BIFF_SHEETPROT_INSERT_ROWS );
-    maSheetProt.mbInsertHyperlinks = !getFlag( nFlags, BIFF_SHEETPROT_INSERT_HLINKS );
-    maSheetProt.mbDeleteColumns    = !getFlag( nFlags, BIFF_SHEETPROT_DELETE_COLUMNS );
-    maSheetProt.mbDeleteRows       = !getFlag( nFlags, BIFF_SHEETPROT_DELETE_ROWS );
-    maSheetProt.mbSelectLocked     = !getFlag( nFlags, BIFF_SHEETPROT_SELECT_LOCKED );
-    maSheetProt.mbSort             = !getFlag( nFlags, BIFF_SHEETPROT_SORT );
-    maSheetProt.mbAutoFilter       = !getFlag( nFlags, BIFF_SHEETPROT_AUTOFILTER );
-    maSheetProt.mbPivotTables      = !getFlag( nFlags, BIFF_SHEETPROT_PIVOTTABLES );
-    maSheetProt.mbSelectUnlocked   = !getFlag( nFlags, BIFF_SHEETPROT_SELECT_UNLOCKED );
-}
-
-void WorksheetSettings::importCodeName( BiffInputStream& rStrm )
-{
-    maSheetSettings.maCodeName = rStrm.readUniString();
-}
-
-void WorksheetSettings::importPhoneticPr( BiffInputStream& rStrm )
-{
-    maPhoneticSett.importPhoneticPr( rStrm );
-}
-
 void WorksheetSettings::finalizeImport()
 {
     // sheet protection
diff --git a/unusedcode.easy b/unusedcode.easy
index 4140104..6699ed5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -834,15 +834,6 @@ 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&)
-oox::xls::WorksheetSettings::importCodeName(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importObjectProtect(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importPassword(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importPhoneticPr(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importProtect(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importScenProtect(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importSheetExt(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importSheetPr(oox::xls::BiffInputStream&)
-oox::xls::WorksheetSettings::importSheetProtection(oox::xls::BiffInputStream&)
 oox::xls::Xf::importXf(oox::xls::BiffInputStream&)
 psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
 psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)