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

Julien Nabet serval2412 at kemper.freedesktop.org
Mon Apr 9 02:39:11 PDT 2012


 sc/source/filter/inc/commentsbuffer.hxx   |    2 --
 sc/source/filter/inc/condformatbuffer.hxx |    2 --
 sc/source/filter/inc/stylesbuffer.hxx     |    2 --
 sc/source/filter/oox/commentsbuffer.cxx   |   29 -----------------------------
 sc/source/filter/oox/condformatbuffer.cxx |    5 -----
 sc/source/filter/oox/stylesbuffer.cxx     |   15 ---------------
 unusedcode.easy                           |    3 ---
 7 files changed, 58 deletions(-)

New commits:
commit b3e2cbc68f3501d3925f8789b1addc8ad4f8e9c0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Apr 9 11:37:16 2012 +0200

    Dump other unused functions in oox

diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx
index 81143a9..9827b82 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -73,8 +73,6 @@ public:
     void                importCommentPr( const AttributeList& rAttribs );
     /** Imports a cell comment from the passed stream of a COMMENT record. */
     void                importComment( SequenceInputStream& rStrm );
-    /** Imports a cell comment from the passed stream of a NOTE record. */
-    void                importNote( BiffInputStream& rStrm );
 
     /** Creates and returns a new rich-string object for the comment text. */
     RichStringRef       createText();
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 393a9d0..e236375 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -168,8 +168,6 @@ public:
     CondFormatRef       importConditionalFormatting( const AttributeList& rAttribs );
     /** Imports settings from the CONDFORMATTING record. */
     CondFormatRef       importCondFormatting( SequenceInputStream& rStrm );
-    /** Imports settings from the CFHEADER record. */
-    void                importCfHeader( BiffInputStream& rStrm );
 
     /** Creates all conditional formatting in the Calc document. */
     void                finalizeImport();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 22af2be..409af4d 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -148,8 +148,6 @@ public:
     void                importPaletteColor( const AttributeList& rAttribs );
     /** Appends a new color from the passed RGBCOLOR record. */
     void                importPaletteColor( SequenceInputStream& rStrm );
-    /** Imports the PALETTE record from the passed stream. */
-    void                importPalette( BiffInputStream& rStrm );
 
     /** Rturns the RGB value of the color with the passed index. */
     sal_Int32           getColor( sal_Int32 nPaletteIdx ) const;
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index a1bef7d..0ea4ca2 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -145,35 +145,6 @@ void Comment::importComment( SequenceInputStream& rStrm )
     getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() );
 }
 
-void Comment::importNote( BiffInputStream& rStrm )
-{
-    BinAddress aBinAddr;
-    rStrm >> aBinAddr;
-    // cell range will be checked while inserting the comment into the document
-    getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, BinRange( aBinAddr ), getSheetIndex() );
-
-    // remaining record data is BIFF dependent
-    switch( getBiff() )
-    {
-        case BIFF2:
-        case BIFF3:
-            importNoteBiff2( rStrm );
-        break;
-        case BIFF4:
-        case BIFF5:
-            importNoteBiff2( rStrm );
-            // in BIFF4 and BIFF5, comments can have an associated sound
-            if( (rStrm.getNextRecId() == BIFF_ID_NOTESOUND) && rStrm.startNextRecord() )
-                importNoteSound( rStrm );
-        break;
-        case BIFF8:
-            importNoteBiff8( rStrm );
-        break;
-        case BIFF_UNKNOWN:
-        break;
-    }
-}
-
 RichStringRef Comment::createText()
 {
     maModel.mxText.reset( new RichString( *this ) );
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index b10210f..2985a8f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -735,11 +735,6 @@ CondFormatRef CondFormatBuffer::importCondFormatting( SequenceInputStream& rStrm
     return xCondFmt;
 }
 
-void CondFormatBuffer::importCfHeader( BiffInputStream& rStrm )
-{
-    createCondFormat()->importCfHeader( rStrm );
-}
-
 void CondFormatBuffer::finalizeImport()
 {
     maCondFormats.forEachMem( &CondFormat::finalizeImport );
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 11a5608..26b146a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -550,21 +550,6 @@ void ColorPalette::importPaletteColor( SequenceInputStream& rStrm )
     appendColor( nRgb & 0xFFFFFF );
 }
 
-void ColorPalette::importPalette( BiffInputStream& rStrm )
-{
-    sal_uInt16 nCount;
-    rStrm >> nCount;
-    OSL_ENSURE( rStrm.getRemaining() == 4 * nCount, "ColorPalette::importPalette - wrong palette size" );
-
-    // fill palette from BIFF_COLOR_USEROFFSET
-    mnAppendIndex = BIFF_COLOR_USEROFFSET;
-    for( sal_uInt16 nIndex = 0; !rStrm.isEof() && (nIndex < nCount); ++nIndex )
-    {
-        sal_Int32 nRgb = lclReadRgbColor( rStrm );
-        appendColor( nRgb & 0xFFFFFF );
-    }
-}
-
 sal_Int32 ColorPalette::getColor( sal_Int32 nPaletteIdx ) const
 {
     sal_Int32 nColor = API_RGB_TRANSPARENT;
diff --git a/unusedcode.easy b/unusedcode.easy
index 34759c6..ff54fe7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -804,9 +804,6 @@ oox::xls::BiffSheetDataContext::BiffSheetDataContext(oox::xls::WorksheetHelper c
 oox::xls::BiffWorksheetFragmentBase::BiffWorksheetFragmentBase(oox::xls::WorksheetHelper const&, oox::xls::BiffWorkbookFragmentBase const&)
 oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
 oox::xls::CellStyleBuffer::importStyle(oox::xls::BiffInputStream&)
-oox::xls::ColorPalette::importPalette(oox::xls::BiffInputStream&)
-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::PivotCache::importPCDSource(oox::xls::BiffInputStream&)


More information about the Libreoffice-commits mailing list