From 368a3e45a3f126d34f794a9118fcef0e3270cd78 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Aug 2015 15:11:45 +0200 Subject: sc: inline some use-once typedefs Change-Id: I332e160dda3f167e61f99da1eb0aa6bd72a48b06 --- sc/inc/sortparam.hxx | 7 +++---- sc/source/core/data/documentimport.cxx | 5 +---- sc/source/core/data/table3.cxx | 7 ++----- sc/source/filter/excel/excimp8.cxx | 4 +--- sc/source/filter/html/htmlpars.cxx | 2 +- sc/source/filter/inc/autofilterbuffer.hxx | 4 ++-- sc/source/filter/inc/htmlpars.hxx | 23 +++++++++++------------ sc/source/filter/inc/sheetdatabuffer.hxx | 3 ++- sc/source/filter/inc/stylesbuffer.hxx | 10 ++++------ sc/source/filter/inc/worksheethelper.hxx | 2 -- sc/source/filter/oox/excelvbaproject.cxx | 9 +++------ sc/source/filter/xml/XMLStylesImportHelper.hxx | 16 +++++++--------- sc/source/filter/xml/xmlimprt.hxx | 5 ++--- sc/source/ui/inc/acredlin.hxx | 5 ----- sc/source/ui/unoobj/shapeuno.cxx | 3 +-- sc/source/ui/vba/vbaaxes.cxx | 4 +--- sc/source/ui/vba/vbaeventshelper.cxx | 7 ++++--- sc/source/ui/vba/vbaformatconditions.hxx | 4 +--- sc/source/ui/vba/vbamenubars.cxx | 4 +--- sc/source/ui/vba/vbapagebreaks.cxx | 3 +-- sc/source/ui/vba/vbapane.hxx | 4 +--- sc/source/ui/vba/vbarange.cxx | 4 ++-- sc/source/ui/vba/vbawindow.cxx | 4 +--- sc/source/ui/vba/vbaworksheets.cxx | 8 ++++---- 24 files changed, 56 insertions(+), 91 deletions(-) (limited to 'sc') diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index ed79c37406f6..08af11933888 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -38,8 +38,6 @@ struct ScSortKeyState bool bAscending; }; -typedef ::std::vector ScSortKeyStateVec; - struct SC_DLLPUBLIC ScSortParam { SCCOL nCol1; @@ -57,9 +55,10 @@ struct SC_DLLPUBLIC ScSortParam SCTAB nDestTab; SCCOL nDestCol; SCROW nDestRow; - ScSortKeyStateVec maKeyState; + ::std::vector + maKeyState; ::com::sun::star::lang::Locale aCollatorLocale; - OUString aCollatorAlgorithm; + OUString aCollatorAlgorithm; sal_uInt16 nCompatHeader; ScSortParam(); diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx index 18346fae2a52..419c36674170 100644 --- a/sc/source/core/data/documentimport.cxx +++ b/sc/source/core/data/documentimport.cxx @@ -42,8 +42,6 @@ struct TabAttr std::vector maCols; }; -typedef std::vector TabAttrsType; - } struct ScDocumentImportImpl @@ -52,8 +50,7 @@ struct ScDocumentImportImpl sc::StartListeningContext maListenCxt; sc::ColumnBlockPositionSet maBlockPosSet; SvtScriptType mnDefaultScriptNumeric; - - TabAttrsType maTabAttrs; + std::vector maTabAttrs; ScDocumentImportImpl(ScDocument& rDoc) : mrDoc(rDoc), diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 896b59b6dd6f..372e8da7b91b 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -670,9 +670,6 @@ public: } }; -typedef ReorderNotifier ColReorderNotifier; -typedef ReorderNotifier RowReorderNotifier; - class StartListeningNotifier : std::unary_function { sc::RefStartListeningHint maHint; @@ -992,7 +989,7 @@ void ScTable::SortReorderByColumn( // once. std::sort(aListeners.begin(), aListeners.end()); aListeners.erase(std::unique(aListeners.begin(), aListeners.end()), aListeners.end()); - ColReorderNotifier aFunc(aColMap, nTab, nRow1, nRow2); + ReorderNotifier aFunc(aColMap, nTab, nRow1, nRow2); std::for_each(aListeners.begin(), aListeners.end(), aFunc); // Re-start area listeners on the reordered columns. @@ -1421,7 +1418,7 @@ void ScTable::SortReorderByRowRefUpdate( } // Notify the listeners to update their references. - RowReorderNotifier aFunc(aRowMap, nTab, nCol1, nCol2); + ReorderNotifier aFunc(aRowMap, nTab, nCol1, nCol2); std::for_each(aListeners.begin(), aListeners.end(), aFunc); // Re-group formulas in affected columns. diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index ce349fe1af4c..03ea1f34fcb2 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -109,9 +109,7 @@ using namespace ::comphelper; //OleNameOverrideContainer -typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideContainer_BASE; - -class OleNameOverrideContainer : public OleNameOverrideContainer_BASE +class OleNameOverrideContainer : public ::cppu::WeakImplHelper1< container::XNameContainer > { private: typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 32d5a1da12c5..178796b4cefc 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -491,7 +491,7 @@ void ScHTMLLayoutParser::Adjust() { xLockedList->RemoveAll(); - ScHTMLAdjustStack aStack; + ::std::stack< ScHTMLAdjustStackEntry* > aStack; ScHTMLAdjustStackEntry* pS = NULL; sal_uInt16 nTab = 0; SCCOL nLastCol = SCCOL_MAX; diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 65ae36b17992..1a3450feb9e7 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -64,7 +64,6 @@ public: virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); }; -typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef; /** Settings for a discrete filter, specifying a list of values to be shown in the filtered range. @@ -177,7 +176,8 @@ public: ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); private: - FilterSettingsRef mxSettings; + ::boost::shared_ptr< FilterSettingsBase > + mxSettings; sal_Int32 mnColId; bool mbHiddenButton; bool mbShowButton; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index c7f526bfe6c2..2b5c2c4315ca 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -130,7 +130,6 @@ struct ScHTMLTableStackEntry {} ~ScHTMLTableStackEntry() {} }; -typedef ::std::stack< ScHTMLTableStackEntry* > ScHTMLTableStack; struct ScHTMLAdjustStackEntry { @@ -143,7 +142,6 @@ struct ScHTMLAdjustStackEntry nCurRow( nCRow ) {} }; -typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; class EditEngine; class ScDocument; @@ -157,23 +155,24 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - OUString aBaseURL; - ScHTMLTableStack aTableStack; - OUString aString; + OUString aBaseURL; + ::std::stack< ScHTMLTableStackEntry* > + aTableStack; + OUString aString; ScRangeListRef xLockedList; // je Table OuterMap* pTables; ScHTMLColOffset* pColOffset; ScHTMLColOffset* pLocalColOffset; // je Table - sal_uLong nFirstTableCell; // je Table + sal_uLong nFirstTableCell; // je Table short nTableLevel; - sal_uInt16 nTable; - sal_uInt16 nMaxTable; + sal_uInt16 nTable; + sal_uInt16 nMaxTable; SCCOL nColCntStart; // erste Col je Table SCCOL nMaxCol; // je Table - sal_uInt16 nTableWidth; // je Table - sal_uInt16 nColOffset; // aktuell, Pixel - sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel - sal_uInt16 nOffsetTolerance; // for use with SeekOffset and related + sal_uInt16 nTableWidth; // je Table + sal_uInt16 nColOffset; // aktuell, Pixel + sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel + sal_uInt16 nOffsetTolerance; // for use with SeekOffset and related bool bTabInTabCell:1; bool bFirstRow:1; // je Table, ob in erster Zeile bool bInCell:1; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 9612e84b127f..35832b25aa6b 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -229,7 +229,8 @@ private: CellBlockBuffer maCellBlocks; /// Manages all open cell blocks. ArrayFormulaList maArrayFormulas; /// All array formulas in the sheet. TableOperationList maTableOperations; /// All table operations in the sheet. - SharedFormulaMap maSharedFormulas; /// Maps shared formula base address to defined name token index. + ::std::map< BinAddress, ApiTokenSequence > + maSharedFormulas; /// Maps shared formula base address to defined name token index. ::com::sun::star::table::CellAddress maSharedFmlaAddr; /// Address of a cell containing a pending shared formula. css::table::CellAddress maSharedBaseAddr; /// Base address of the pending shared formula. diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index de9aded3bd6f..a71cecd01f82 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -350,8 +350,6 @@ private: ApiAlignmentData maApiData; /// Alignment data converted to API constants. }; -typedef std::shared_ptr< Alignment > AlignmentRef; - /** Contains all XML cell protection attributes, e.g. from a protection element. */ struct ProtectionModel { @@ -398,8 +396,6 @@ private: ApiProtectionData maApiData; /// Protection data converted to API constants. }; -typedef std::shared_ptr< Protection > ProtectionRef; - /** Contains XML attributes of a single border line. */ struct BorderLineModel { @@ -715,8 +711,10 @@ public: private: FontRef mxFont; /// Font data. NumberFormatRef mxNumFmt; /// Number format data. - AlignmentRef mxAlignment; /// Alignment data. - ProtectionRef mxProtection; /// Protection data. + std::shared_ptr< Alignment > + mxAlignment; /// Alignment data. + std::shared_ptr< Protection > + mxProtection; /// Protection data. BorderRef mxBorder; /// Border data. FillRef mxFill; /// Fill data. }; diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 663baade1f3f..e11d6aa340be 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -61,8 +61,6 @@ class WorksheetSettings; typedef ::std::map< OUString, ScDataBarFormatData* > ExtLst; -typedef ::std::map< BinAddress, ApiTokenSequence > SharedFormulaMap; - /** An enumeration for all types of sheets in a workbook. */ enum WorksheetType { diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index c6ffb14f0e3a..1dfd8ee68cab 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -62,9 +62,6 @@ struct SheetCodeNameInfo maSheetProps( rSheetProps ), maPrefix( rPrefix ) {} }; -typedef ::std::set< OUString > CodeNameSet; -typedef ::std::list< SheetCodeNameInfo > SheetCodeNameInfoList; - } // namespace void ExcelVbaProject::prepareImport() @@ -74,10 +71,10 @@ void ExcelVbaProject::prepareImport() if( mxDocument.is() ) try { // collect existing codenames (do not use them when creating new codenames) - CodeNameSet aUsedCodeNames; + ::std::set< OUString > aUsedCodeNames; // collect sheets without codenames - SheetCodeNameInfoList aCodeNameInfos; + ::std::list< SheetCodeNameInfo > aCodeNameInfos; // iterate over all imported sheets Reference< XEnumerationAccess > xSheetsEA( mxDocument->getSheets(), UNO_QUERY_THROW ); @@ -103,7 +100,7 @@ void ExcelVbaProject::prepareImport() } // create new codenames if sheets do not have one - for( SheetCodeNameInfoList::iterator aIt = aCodeNameInfos.begin(), aEnd = aCodeNameInfos.end(); aIt != aEnd; ++aIt ) + for( ::std::list< SheetCodeNameInfo >::iterator aIt = aCodeNameInfos.begin(), aEnd = aCodeNameInfos.end(); aIt != aEnd; ++aIt ) { // search for an unused codename sal_Int32 nCounter = 1; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index bb1b11effad1..b4f5e74de5ea 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -105,12 +105,11 @@ public: void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport); }; -typedef tools::SvRef ScMyStyleRangesRef; struct ScMyStyle { - OUString sStyleName; - ScMyStyleRangesRef xRanges; + OUString sStyleName; + tools::SvRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} ~ScMyStyle() {} @@ -125,18 +124,17 @@ struct LessStyle }; typedef std::set ScMyStylesSet; -typedef std::vector ScMyStyles; class ScMyStylesImportHelper { ScMyStylesSet aCellStyles; - ScMyStyles aColDefaultStyles; + std::vector aColDefaultStyles; ScMyStylesSet::iterator aRowDefaultStyle; ScXMLImport& rImport; - OUString* pStyleName; - OUString* pPrevStyleName; - OUString* pCurrency; - OUString* pPrevCurrency; + OUString* pStyleName; + OUString* pPrevStyleName; + OUString* pCurrency; + OUString* pPrevCurrency; ScRange aPrevRange; sal_Int16 nCellType; sal_Int16 nPrevCellType; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 6efb408669b1..413b78339038 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -817,7 +817,6 @@ struct ScMyImportValidation }; typedef std::vector ScMyImportValidations; -typedef std::list ScMyViewContextList; class ScMyStylesImportHelper; class ScXMLEditAttributeMap; @@ -836,8 +835,8 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable mutable boost::scoped_ptr mpEditAttrMap; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScMyViewContextList aViewContextList; - ScMyStylesImportHelper* pStylesImportHelper; + std::list aViewContextList; + ScMyStylesImportHelper* pStylesImportHelper; OUString sNumberFormat; OUString sLocale; OUString sCellStyle; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 2738f10329c4..860c402536a6 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -52,11 +52,6 @@ public: bool bIsAcceptable; }; -typedef long LExpNum; - -//@ Expand entrys are ambiguous and therefore removed -//DECLARE_TABLE( ScChgTrackExps, LExpNum) - class ScAcceptChgDlg : public SfxModelessDialog { private: diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 57dfd482024c..177cfc7d31f1 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1361,8 +1361,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() #define SC_EVENTACC_SCRIPT "Script" #define SC_EVENTACC_EVENTTYPE "EventType" -typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; -class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE +class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper1< container::XNameReplace > { private: ScShapeObj* mpShape; diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index cf855f1eda66..47020c181ddf 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -37,8 +37,6 @@ using namespace ::ooo::vba::excel::XlAxisGroup; typedef ::std::pair AxesCoordinate; // type and group combination typedef ::std::vector< AxesCoordinate > vecAxesIndices; -typedef ::cppu::WeakImplHelper1< container::XIndexAccess > AxisIndexWrapper_BASE; - namespace { class EnumWrapper : public EnumerationHelper_BASE @@ -84,7 +82,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: namespace { -class AxisIndexWrapper : public AxisIndexWrapper_BASE +class AxisIndexWrapper : public ::cppu::WeakImplHelper1< container::XIndexAccess > { // if necessary for better performance we could change this into a map and cache the // indices -> Axis, currently we create a new Axis object diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 6fc4e472a97b..94fa0d5b67f5 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -107,10 +107,11 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace -typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; - // This class is to process Workbook window related event -class ScVbaEventListener : public ScVbaEventListener_BASE +class ScVbaEventListener : public ::cppu::WeakImplHelper4< awt::XTopWindowListener, + awt::XWindowListener, + frame::XBorderResizeListener, + util::XChangesListener > { public: ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ); diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index d8dfef49250d..45d00018b0c2 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -28,8 +28,6 @@ #include #include -typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE; - // This class is used only as a target for casting, it seems, // and no objects of this type are created as such, I think. // So avoid MSVC warnings: @@ -42,7 +40,7 @@ typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions #pragma warning(disable: 4610) #endif -class ScVbaFormatConditions: public ScVbaFormatConditions_BASE +class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatConditions > { css::table::CellAddress maCellAddress; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 265f9a1d7e84..aa289f22c39c 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -13,9 +13,7 @@ using namespace com::sun::star; using namespace ooo::vba; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE; - -class MenuBarEnumeration : public MenuBarEnumeration_BASE +class MenuBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > { uno::Reference< XHelperInterface > m_xParent; uno::Reference< uno::XComponentContext > m_xContext; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 8e9744cb5854..dcab022f6c12 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -22,8 +22,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef ::cppu::WeakImplHelper1 RangePageBreaks_Base; -class RangePageBreaks : public RangePageBreaks_Base +class RangePageBreaks : public ::cppu::WeakImplHelper1 { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index dd94655cc7a8..8553966a646e 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -24,9 +24,7 @@ #include #include "excelvbahelper.hxx" -typedef cppu::WeakImplHelper1< ov::excel::XPane > ScVbaPane_BASE; - -class ScVbaPane : public ScVbaPane_BASE +class ScVbaPane : public cppu::WeakImplHelper1< ov::excel::XPane > { public: ScVbaPane( diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 6ecc6f88c7ad..a65dbc8d9648 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -309,9 +309,9 @@ public: // very simple class to pass to ScVbaCollectionBaseImpl containing // just one item -typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SingleRange_BASE; -class SingleRangeIndexAccess : public SingleRange_BASE +class SingleRangeIndexAccess : public ::cppu::WeakImplHelper2< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 6ed0c840c697..7f2701732eae 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -54,14 +54,12 @@ SCTAB, OUStringHash, typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > Enumeration_BASE; - typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > SelectedSheets_BASE; -class SelectedSheetsEnum : public Enumeration_BASE +class SelectedSheetsEnum : public ::cppu::WeakImplHelper1< container::XEnumeration > { public: uno::Reference< uno::XComponentContext > m_xContext; diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index c07fbd9b3d13..18b8515f8bed 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -52,8 +52,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE; -typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE; // a map ( or hashmap ) wont do as we need also to preserve the order // (as added ) of the items typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; @@ -61,7 +59,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection -class WorkSheetsEnumeration : public SheetEnumeration_BASE +class WorkSheetsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > { SheetMap mSheetMap; SheetMap::iterator mIt; @@ -80,7 +78,9 @@ public: } }; -class SheetCollectionHelper : public SheetCollectionHelper_BASE +class SheetCollectionHelper : public ::cppu::WeakImplHelper3< container::XNameAccess, + container::XIndexAccess, + container::XEnumerationAccess > { SheetMap mSheetMap; SheetMap::iterator cachePos; -- cgit