[Libreoffice-commits] .: sc/source unusedcode.easy
Julien Nabet
serval2412 at kemper.freedesktop.org
Fri Apr 6 16:22:26 PDT 2012
sc/source/filter/inc/pagesettings.hxx | 25 --------
sc/source/filter/oox/pagesettings.cxx | 100 ----------------------------------
unusedcode.easy | 12 ----
3 files changed, 137 deletions(-)
New commits:
commit c1036d7ab06e6b85763e90659c08e1f450ff50ab
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Apr 7 01:20:48 2012 +0200
Remove unused code oox::xls::PageSettings
diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx
index 0ce662c..5ff75bc 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -125,31 +125,6 @@ public:
/** Imports the PICTURE record from the passed stream. */
void importPicture( const ::oox::core::Relations& rRelations, SequenceInputStream& rStrm );
- /** Imports the LEFTMARGIN record from the passed BIFF stream. */
- void importLeftMargin( BiffInputStream& rStrm );
- /** Imports the RIGHTMARGIN record from the passed BIFF stream. */
- void importRightMargin( BiffInputStream& rStrm );
- /** Imports the TOPMARGIN record from the passed BIFF stream. */
- void importTopMargin( BiffInputStream& rStrm );
- /** Imports the BOTTOMMARGIN record from the passed BIFF stream. */
- void importBottomMargin( BiffInputStream& rStrm );
- /** Imports the SETUP record from the passed BIFF stream. */
- void importPageSetup( BiffInputStream& rStrm );
- /** Imports the HCENTER record from the passed BIFF stream. */
- void importHorCenter( BiffInputStream& rStrm );
- /** Imports the VCENTER record from the passed BIFF stream. */
- void importVerCenter( BiffInputStream& rStrm );
- /** Imports the PRINTHEADERS record from the passed BIFF stream. */
- void importPrintHeaders( BiffInputStream& rStrm );
- /** Imports the PRINTGRIDLINES record from the passed BIFF stream. */
- void importPrintGridLines( BiffInputStream& rStrm );
- /** Imports the HEADER record from the passed BIFF stream. */
- void importHeader( BiffInputStream& rStrm );
- /** Imports the FOOTER record from the passed BIFF stream. */
- void importFooter( BiffInputStream& rStrm );
- /** Imports the PICTURE record from the passed BIFF stream. */
- void importPicture( BiffInputStream& rStrm );
-
/** Sets whether percentual scaling or fit to width/height scaling is used. */
void setFitToPagesMode( bool bFitToPages );
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 6f140b1..8fcbd72 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -328,106 +328,6 @@ void PageSettings::importPicture( const Relations& rRelations, SequenceInputStre
importPictureData( rRelations, BiffHelper::readString( rStrm ) );
}
-void PageSettings::importLeftMargin( BiffInputStream& rStrm )
-{
- rStrm >> maModel.mfLeftMargin;
-}
-
-void PageSettings::importRightMargin( BiffInputStream& rStrm )
-{
- rStrm >> maModel.mfRightMargin;
-}
-
-void PageSettings::importTopMargin( BiffInputStream& rStrm )
-{
- rStrm >> maModel.mfTopMargin;
-}
-
-void PageSettings::importBottomMargin( BiffInputStream& rStrm )
-{
- rStrm >> maModel.mfBottomMargin;
-}
-
-void PageSettings::importPageSetup( BiffInputStream& rStrm )
-{
- sal_uInt16 nPaperSize, nScale, nFirstPage, nFitToWidth, nFitToHeight, nFlags;
- rStrm >> nPaperSize >> nScale >> nFirstPage >> nFitToWidth >> nFitToHeight >> nFlags;
-
- maModel.mnPaperSize = nPaperSize; // equal in BIFF and OOX
- maModel.mnScale = nScale;
- maModel.mnFirstPage = nFirstPage;
- maModel.mnFitToWidth = nFitToWidth;
- maModel.mnFitToHeight = nFitToHeight;
- maModel.mnOrientation = getFlagValue( nFlags, BIFF_PAGESETUP_PORTRAIT, XML_portrait, XML_landscape );
- maModel.mnPageOrder = getFlagValue( nFlags, BIFF_PAGESETUP_INROWS, XML_overThenDown, XML_downThenOver );
- maModel.mbValidSettings = !getFlag( nFlags, BIFF_PAGESETUP_INVALID );
- maModel.mbUseFirstPage = true;
- maModel.mbBlackWhite = getFlag( nFlags, BIFF_PAGESETUP_BLACKWHITE );
-
- if( getBiff() >= BIFF5 )
- {
- sal_uInt16 nHorPrintRes, nVerPrintRes, nCopies;
- rStrm >> nHorPrintRes >> nVerPrintRes >> maModel.mfHeaderMargin >> maModel.mfFooterMargin >> nCopies;
-
- maModel.mnCopies = nCopies;
- maModel.mnOrientation = getFlagValue( nFlags, BIFF_PAGESETUP_DEFAULTORIENT, XML_default, maModel.mnOrientation );
- maModel.mnHorPrintRes = nHorPrintRes;
- maModel.mnVerPrintRes = nVerPrintRes;
- maModel.mnCellComments = getFlagValue( nFlags, BIFF_PAGESETUP_PRINTNOTES, XML_asDisplayed, XML_none );
- maModel.mbUseFirstPage = getFlag( nFlags, BIFF_PAGESETUP_USEFIRSTPAGE );
- maModel.mbDraftQuality = getFlag( nFlags, BIFF_PAGESETUP_DRAFTQUALITY );
-
- if( getBiff() == BIFF8 )
- {
- maModel.setBiffPrintErrors( extractValue< sal_uInt8 >( nFlags, 10, 2 ) );
- maModel.mnCellComments = getFlagValue( nFlags, BIFF_PAGESETUP_PRINTNOTES, getFlagValue( nFlags, BIFF_PAGESETUP_NOTES_END, XML_atEnd, XML_asDisplayed ), XML_none );
- }
- }
-}
-
-void PageSettings::importHorCenter( BiffInputStream& rStrm )
-{
- maModel.mbHorCenter = rStrm.readuInt16() != 0;
-}
-
-void PageSettings::importVerCenter( BiffInputStream& rStrm )
-{
- maModel.mbVerCenter = rStrm.readuInt16() != 0;
-}
-
-void PageSettings::importPrintHeaders( BiffInputStream& rStrm )
-{
- maModel.mbPrintHeadings = rStrm.readuInt16() != 0;
-}
-
-void PageSettings::importPrintGridLines( BiffInputStream& rStrm )
-{
- maModel.mbPrintGrid = rStrm.readuInt16() != 0;
-}
-
-void PageSettings::importHeader( BiffInputStream& rStrm )
-{
- if( rStrm.getRemaining() > 0 )
- maModel.maOddHeader = (getBiff() == BIFF8) ? rStrm.readUniString() : rStrm.readByteStringUC( false, getTextEncoding() );
- else
- maModel.maOddHeader = OUString();
-}
-
-void PageSettings::importFooter( BiffInputStream& rStrm )
-{
- if( rStrm.getRemaining() > 0 )
- maModel.maOddFooter = (getBiff() == BIFF8) ? rStrm.readUniString() : rStrm.readByteStringUC( false, getTextEncoding() );
- else
- maModel.maOddFooter = OUString();
-}
-
-void PageSettings::importPicture( BiffInputStream& rStrm )
-{
- StreamDataSequence aPictureData;
- BiffHelper::importImgData( aPictureData, rStrm, getBiff() );
- maModel.maGraphicUrl = getBaseFilter().getGraphicHelper().importGraphicObject( aPictureData );
-}
-
void PageSettings::setFitToPagesMode( bool bFitToPages )
{
maModel.mbFitToPages = bFitToPages;
diff --git a/unusedcode.easy b/unusedcode.easy
index cb5c9fe..a5e4c50 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -824,18 +824,6 @@ oox::xls::Comment::importNote(oox::xls::BiffInputStream&)
oox::xls::CondFormatBuffer::importCfHeader(oox::xls::BiffInputStream&)
oox::xls::Font::importFont(oox::xls::BiffInputStream&)
oox::xls::NumberFormatsBuffer::importFormat(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importBottomMargin(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importFooter(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importHeader(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importHorCenter(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importLeftMargin(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importPageSetup(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importPicture(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importPrintGridLines(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importPrintHeaders(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importRightMargin(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importTopMargin(oox::xls::BiffInputStream&)
-oox::xls::PageSettings::importVerCenter(oox::xls::BiffInputStream&)
oox::xls::PivotCache::importPCDSource(oox::xls::BiffInputStream&)
oox::xls::SheetScenarios::importScenarios(oox::xls::BiffInputStream&)
oox::xls::SheetViewSettings::importPane(oox::xls::BiffInputStream&)
More information about the Libreoffice-commits
mailing list