summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-09 13:54:24 +0200
committerNoel Grandin <noel@peralex.com>2015-10-12 09:13:34 +0200
commite1d7a84955f88be38e8daf9c0f4e242f8e8e3652 (patch)
treebd9f14c78f51693e94a421b1e25ed89ec167ffe0 /sc/source
parent8d811d701fb8618195a87fa05f83cc270bf3839b (diff)
loplugin:mergeclasses
Change-Id: I935c6144a7731091e7fdb0a818b54f30d3304f2e
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/inc/excelhandlers.hxx22
-rw-r--r--sc/source/filter/oox/excelhandlers.cxx4
2 files changed, 8 insertions, 18 deletions
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 97980b500b52..5763aec7cf07 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -74,28 +74,22 @@ public:
const OUString& rFragmentPath );
};
-/** Base class for all BIFF context handlers.
-
- Derived handlers have to implement the importRecord() function that has to
- import the record the passed BIFF input stream currently points to.
- */
-class BiffContextHandler
-{
-public:
- virtual ~BiffContextHandler();
-
- /** Derived classes have to implement importing the current record. */
- virtual void importRecord( BiffInputStream& rStrm ) = 0;
-};
/** Context handler derived from the WorksheetHelper helper class.
+ Base class for all BIFF context handlers.
Used to import contexts in sheet fragments.
*/
-class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelper
+class BiffWorksheetContextBase : public WorksheetHelper
{
protected:
explicit BiffWorksheetContextBase( const WorksheetHelper& rHelper );
+public:
+ /*
+ Derived handlers have to implement the importRecord() function that has to
+ import the record the passed BIFF input stream currently points to.
+ */
+ virtual void importRecord( BiffInputStream& rStrm ) = 0;
};
/** An enumeration for all types of fragments in a BIFF workbook stream. */
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index 9e2c4261a7c0..b6d0c6e4bcf3 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -42,10 +42,6 @@ WorksheetFragmentBase::WorksheetFragmentBase(
{
}
-BiffContextHandler::~BiffContextHandler()
-{
-}
-
BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) :
WorksheetHelper( rHelper )
{