diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-31 16:33:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-31 18:11:29 +0200 |
commit | 779831307fe3da5f2226925972452c9aedeb67a8 (patch) | |
tree | a9a1e2f5937b823b477a93f2d7fd6ee7aa7a3051 /sc/source/filter/oox/workbookhelper.cxx | |
parent | 4e5e40e4c627775caf039870bcc28269a0d05937 (diff) |
Trivially merge ExcelFilterBase into ExcelFilter
Change-Id: I4c5080dd05ea7e00c56a820c8ce226c78d0a46b7
Diffstat (limited to 'sc/source/filter/oox/workbookhelper.cxx')
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 6ab4ecab8450..51fd4266aafc 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -272,7 +272,7 @@ private: OUString maPageStyleServ; /// Service name for a page style. Reference< XSpreadsheetDocument > mxDoc; /// Document model. FilterBase& mrBaseFilter; /// Base filter object. - ExcelFilterBase& mrExcelBase; /// Base object for registration of this structure. + ExcelFilter& mrExcelFilter; /// Base object for registration of this structure. FilterType meFilterType; /// File type of the filter. ProgressBarPtr mxProgressBar; /// The progress bar. StorageRef mxVbaPrjStrg; /// Storage containing the VBA project. @@ -319,21 +319,21 @@ private: WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : mrBaseFilter( rFilter ), - mrExcelBase( rFilter ), + mrExcelFilter( rFilter ), meFilterType( FILTER_OOXML ), mpOoxFilter( &rFilter ), meBiff( BIFF_UNKNOWN ), mpDoc( NULL ) { // register at the filter, needed for virtual callbacks (even during construction) - mrExcelBase.registerWorkbookGlobals( *this ); + mrExcelFilter.registerWorkbookGlobals( *this ); initialize( true ); } WorkbookGlobals::~WorkbookGlobals() { finalize(); - mrExcelBase.unregisterWorkbookGlobals(); + mrExcelFilter.unregisterWorkbookGlobals(); } // document model ------------------------------------------------------------- |