[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/filter/inc/autofilterbuffer.hxx |    6 ------
 sc/source/filter/oox/autofilterbuffer.cxx |   24 ------------------------
 2 files changed, 30 deletions(-)

New commits:
commit 413d1a932eb4c47510dd05905c1ff467cb186d04
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Tue Dec 18 22:09:47 2012 -0200

    Remove unused method from sc: importBiffRecord
    
    As Thomas Arnhold pointed, these method eems to be useless.
    After removing and running calc, it seems to work perfect.
    
    Change-Id: I3e3eb7ba3e2e71bb615f64d5f63ca7f8cac00e9c
    Signed-off-by: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/1410
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 091c026..7b4ca5c 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -63,8 +63,6 @@ public:
     virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
     /** Derived classes import filter settings from the passed record. */
     virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
-    /** Derived classes import filter settings from the FILTERCOLUMN record. */
-    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
 
     /** Derived classes return converted UNO API filter settings representing all filter settings. */
     virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
@@ -110,8 +108,6 @@ public:
     virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
     /** Imports filter settings from the FILTERS and FILTER records. */
     virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
-    /** Imports filter settings from the FILTERCOLUMN record. */
-    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
 
     /** Returns converted UNO API filter settings representing all filter settings. */
     virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
@@ -159,8 +155,6 @@ public:
     virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
     /** Imports filter settings from the FILTERS and FILTER records. */
     virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
-    /** Imports filter settings from the FILTERCOLUMN record. */
-    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
 
     /** Returns converted UNO API filter settings representing all filter settings. */
     virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 1c5345f..6ccb193 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -211,10 +211,6 @@ void FilterSettingsBase::importRecord( sal_Int32 /*nRecId*/, SequenceInputStream
 {
 }
 
-void FilterSettingsBase::importBiffRecord( BiffInputStream& /*rStrm*/, sal_uInt16 /*nFlags*/ )
-{
-}
-
 ApiFilterSettings FilterSettingsBase::finalizeImport( sal_Int32 /*nMaxCount*/ )
 {
     return ApiFilterSettings();
@@ -328,13 +324,6 @@ void Top10Filter::importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm )
     }
 }
 
-void Top10Filter::importBiffRecord( BiffInputStream& /*rStrm*/, sal_uInt16 nFlags )
-{
-    mfValue = extractValue< sal_uInt16 >( nFlags, 7, 9 );
-    mbTop = getFlag( nFlags, BIFF_FILTERCOLUMN_TOP );
-    mbPercent = getFlag( nFlags, BIFF_FILTERCOLUMN_PERCENT );
-}
-
 ApiFilterSettings Top10Filter::finalizeImport( sal_Int32 /*nMaxCount*/ )
 {
     sal_Int32 nOperator = mbTop ?
@@ -512,19 +501,6 @@ void CustomFilter::importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm )
     }
 }
 
-void CustomFilter::importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags )
-{
-    mbAnd = !getFlag( nFlags, BIFF_FILTERCOLUMN_OR );
-
-    FilterCriterionModel aCriterion1, aCriterion2;
-    aCriterion1.readBiffData( rStrm );
-    aCriterion2.readBiffData( rStrm );
-    aCriterion1.readString( rStrm, getBiff(), getTextEncoding() );
-    aCriterion2.readString( rStrm, getBiff(), getTextEncoding() );
-    appendCriterion( aCriterion1 );
-    appendCriterion( aCriterion2 );
-}
-
 ApiFilterSettings CustomFilter::finalizeImport( sal_Int32 /*nMaxCount*/ )
 {
     ApiFilterSettings aSettings;