diff options
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/excelhandlers.hxx | 22 | ||||
| -rw-r--r-- | sc/source/filter/oox/excelhandlers.cxx | 4 |
3 files changed, 8 insertions, 19 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 57a299488f04..8e9c77dcd16d 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -136,7 +136,6 @@ merge oox::dump::Address with oox::dump::TokenAddress merge oox::dump::ItemFormat with oox::dump::CombiList::ExtItemFormat merge oox::formulaimport::XmlStream with oox::formulaimport::XmlStreamBuilder merge oox::ole::OleObjectInfo with oox::vml::OleObjectInfo -merge oox::xls::BiffContextHandler with oox::xls::BiffWorksheetContextBase merge oox::xls::IWorksheetProgress with oox::xls::WorksheetGlobals merge pcr::(anonymous namespace)::ISQLCommandPropertyUI with pcr::(anonymous namespace)::SQLCommandPropertyUI merge pcr::IButtonClickListener with pcr::OBrowserListBox 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 ) { |