diff options
Diffstat (limited to 'oox/inc/oox/xls/excelhandlers.hxx')
| -rw-r--r-- | oox/inc/oox/xls/excelhandlers.hxx | 82 |
1 files changed, 12 insertions, 70 deletions
diff --git a/oox/inc/oox/xls/excelhandlers.hxx b/oox/inc/oox/xls/excelhandlers.hxx index 864f5f9a9e44..deaa5244b0d0 100644 --- a/oox/inc/oox/xls/excelhandlers.hxx +++ b/oox/inc/oox/xls/excelhandlers.hxx @@ -45,55 +45,24 @@ class WorkbookContextBase : public ::oox::core::ContextHandler2, public Workbook { public: template< typename ParentType > - explicit WorkbookContextBase( ParentType& rParent ); + inline explicit WorkbookContextBase( ParentType& rParent ) : + ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {} }; -// ---------------------------------------------------------------------------- - -template< typename ParentType > -WorkbookContextBase::WorkbookContextBase( ParentType& rParent ) : - ::oox::core::ContextHandler2( rParent ), - WorkbookHelper( rParent ) -{ -} - // ============================================================================ /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. */ -class WorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelperRoot +class WorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelper { public: template< typename ParentType > - explicit WorksheetContextBase( - ParentType& rParent, - const ISegmentProgressBarRef& rxProgressBar, - WorksheetType eSheetType, - sal_Int16 nSheet ); - - template< typename ParentType > - explicit WorksheetContextBase( ParentType& rParent ); + inline explicit WorksheetContextBase( ParentType& rParent ) : + ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {} }; -// ---------------------------------------------------------------------------- - -template< typename ParentType > -WorksheetContextBase::WorksheetContextBase( ParentType& rParent, - const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : - ::oox::core::ContextHandler2( rParent ), - WorksheetHelperRoot( rParent, rxProgressBar, eSheetType, nSheet ) -{ -} - -template< typename ParentType > -WorksheetContextBase::WorksheetContextBase( ParentType& rParent ) : - ::oox::core::ContextHandler2( rParent ), - WorksheetHelperRoot( rParent ) -{ -} - // ============================================================================ /** Fragment handler derived from the WorkbookHelper helper class. @@ -114,17 +83,10 @@ public: Used to import sheet fragments. */ -class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelperRoot +class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelper { public: explicit WorksheetFragmentBase( - const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, - const ISegmentProgressBarRef& rxProgressBar, - WorksheetType eSheetType, - sal_Int16 nSheet ); - - explicit WorksheetFragmentBase( const WorksheetHelper& rHelper, const ::rtl::OUString& rFragmentPath ); }; @@ -164,15 +126,9 @@ protected: Used to import contexts in sheet fragments. */ -class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelperRoot +class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelper { protected: - explicit BiffWorksheetContextBase( - const WorkbookHelper& rHelper, - const ISegmentProgressBarRef& rxProgressBar, - WorksheetType eSheetType, - sal_Int16 nSheet ); - explicit BiffWorksheetContextBase( const WorksheetHelper& rHelper ); }; @@ -220,17 +176,6 @@ protected: */ BiffFragmentType startFragment( BiffType eBiff ); - /** Starts a new fragment at a specific position in the workbbok stream and - returns the fragment type. - - The passed record handle must specify the stream position of the BOF - record of the fragment substream. The function will try to start the - next record and read the contents of the BOF record, if extant. - - @return Fragment type according to the imported BOF record. - */ - BiffFragmentType startFragment( BiffType eBiff, sal_Int64 nRecHandle ); - /** Skips the current fragment up to its trailing EOF record. Skips all records until next EOF record. When this function returns, @@ -273,14 +218,12 @@ protected: Used to import sheet fragments. */ -class BiffWorksheetFragmentBase : public BiffFragmentHandler, public WorksheetHelperRoot +class BiffWorksheetFragmentBase : public BiffFragmentHandler, public WorksheetHelper { protected: explicit BiffWorksheetFragmentBase( - const BiffWorkbookFragmentBase& rParent, - const ISegmentProgressBarRef& rxProgressBar, - WorksheetType eSheetType, - sal_Int16 nSheet ); + const WorksheetHelper& rHelper, + const BiffWorkbookFragmentBase& rParent ); }; // ---------------------------------------------------------------------------- @@ -291,9 +234,8 @@ class BiffSkipWorksheetFragment : public BiffWorksheetFragmentBase { public: explicit BiffSkipWorksheetFragment( - const BiffWorkbookFragmentBase& rParent, - const ISegmentProgressBarRef& rxProgressBar, - sal_Int16 nSheet ); + const WorksheetHelper& rHelper, + const BiffWorkbookFragmentBase& rParent ); virtual bool importFragment(); }; |