diff options
Diffstat (limited to 'sc/source/filter/excel')
| -rw-r--r-- | sc/source/filter/excel/xechart.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/excel/xeformula.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/xelink.cxx | 15 | ||||
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 12 | ||||
| -rw-r--r-- | sc/source/filter/excel/xilink.cxx | 17 | ||||
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 7 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlstyle.cxx | 3 |
9 files changed, 31 insertions, 46 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 9537686e782f..dd3e81a8b97b 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -2422,8 +2422,7 @@ void XclExpChTypeGroup::ConvertSeries( Reference< XDataSeriesContainer > xSeriesCont( xChartType, UNO_QUERY ); if( xSeriesCont.is() ) { - typedef ::std::vector< Reference< XDataSeries > > XDataSeriesVec; - XDataSeriesVec aSeriesVec; + std::vector< Reference< XDataSeries > > aSeriesVec; // copy data series attached to the current axes set to the vector const Sequence< Reference< XDataSeries > > aSeriesSeq = xSeriesCont->getDataSeries(); diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 9e524944e9ea..51b151a7ba08 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -100,10 +100,10 @@ public: private: typedef ::std::vector< XclExpHashEntry > XclExpHashVec; - typedef ::std::vector< XclExpHashVec > XclExpHashTab; std::vector< XclExpStringRef > maStringVector; /// List of unique strings (in SST ID order). - XclExpHashTab maHashTab; /// Hashed table that manages string pointers. + std::vector< XclExpHashVec > + maHashTab; /// Hashed table that manages string pointers. sal_uInt32 mnTotal; /// Total count of strings (including doubles). sal_uInt32 mnSize; /// Size of the SST (count of unique strings). }; diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 72dcfa8124be..cd01aaeb2b23 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -100,7 +100,6 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon } typedef std::shared_ptr< XclExpOperandList > XclExpOperandListRef; -typedef std::vector< XclExpOperandListRef > XclExpOperandListVector; /** Encapsulates all data needed for a call to an external function (macro, add-in). */ struct XclExpExtFuncData @@ -270,7 +269,8 @@ struct XclExpCompData ScfUInt8Vec maTokVec; /// Byte vector containing token data. ScfUInt8Vec maExtDataVec; /// Byte vector containing extended data (arrays, stacked NLRs). - XclExpOperandListVector maOpListVec; /// Formula structure, maps operators to their operands. + std::vector< XclExpOperandListRef > + maOpListVec; /// Formula structure, maps operators to their operands. ScfUInt16Vec maOpPosStack; /// Stack with positions of operand tokens waiting for an operator. bool mbStopAtSep; /// True = Stop subexpression creation at an ocSep token. bool mbVolatile; /// True = Formula contains volatile function. @@ -454,12 +454,12 @@ private: private: typedef std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap; typedef std::shared_ptr< XclExpCompData > XclExpCompDataRef; - typedef std::vector< XclExpCompDataRef > XclExpCompDataVector; XclExpCompConfigMap maCfgMap; /// Compiler configuration map for all formula types. XclFunctionProvider maFuncProv; /// Excel function data provider. XclExpCompDataRef mxData; /// Working data for current formula. - XclExpCompDataVector maDataStack; /// Stack for working data, when compiler is called recursively. + std::vector< XclExpCompDataRef > + maDataStack; /// Stack for working data, when compiler is called recursively. const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. const SCCOL mnMaxAbsCol; /// Maximum column index. const SCROW mnMaxAbsRow; /// Maximum row index. diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index e2504f6a00b3..e3efd87072f8 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -147,17 +147,13 @@ public: virtual void SaveXml(XclExpXmlStream& rStrm) override; private: - typedef XclExpRecordList< XclExpExtNameBase > XclExpExtNameList; - -private: /** Returns the 1-based (Excel-like) list index of the external name or 0, if not found. */ sal_uInt16 GetIndex( const OUString& rName ) const; /** Appends the passed newly crested external name. @return The 1-based (Excel-like) list index of the appended name. */ sal_uInt16 AppendNew( XclExpExtNameBase* pExtName ); -private: - XclExpExtNameList maNameList; /// The list with all EXTERNNAME records. + XclExpRecordList< XclExpExtNameBase > maNameList; /// The list with all EXTERNNAME records. }; // Cached external cells ====================================================== @@ -453,7 +449,6 @@ public: void Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab ) { mnSupbook = nSupbook; mnSBTab = nSBTab; } }; - typedef ::std::vector< XclExpSBIndex > XclExpSBIndexVec; private: typedef XclExpRecordList< XclExpSupbook > XclExpSupbookList; @@ -479,7 +474,8 @@ private: private: XclExpSupbookList maSupbookList; /// List of all SUPBOOK records. - XclExpSBIndexVec maSBIndexVec; /// SUPBOOK and sheet name index for each Excel sheet. + std::vector< XclExpSBIndex > + maSBIndexVec; /// SUPBOOK and sheet name index for each Excel sheet. sal_uInt16 mnOwnDocSB; /// Index to SUPBOOK for own document. sal_uInt16 mnAddInSB; /// Index to add-in SUPBOOK. }; @@ -657,10 +653,9 @@ private: sal_uInt16 InsertXti( const XclExpXti& rXti ); private: - typedef ::std::vector< XclExpXti > XclExpXtiVec; - XclExpSupbookBuffer maSBBuffer; /// List of all SUPBOOK records. - XclExpXtiVec maXtiVec; /// List of XTI structures for the EXTERNSHEET record. + XclExpSupbookBuffer maSBBuffer; /// List of all SUPBOOK records. + std::vector< XclExpXti > maXtiVec; /// List of XTI structures for the EXTERNSHEET record. }; } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 401a49ef8969..1c63824ca907 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -294,13 +294,13 @@ private: private: typedef std::vector< std::unique_ptr<XclListColor> > XclListColorList; typedef std::shared_ptr< XclListColorList > XclListColorListRef; - typedef ::std::vector< XclColorIdData > XclColorIdDataVec; - typedef ::std::vector< XclPaletteColor > XclPaletteColorVec; const XclDefaultPalette& mrDefPal; /// The default palette for the current BIFF version. XclListColorListRef mxColorList; /// Working color list. - XclColorIdDataVec maColorIdDataVec; /// Data of all CIDs. - XclPaletteColorVec maPalette; /// Contains resulting colors to export. + std::vector< XclColorIdData > + maColorIdDataVec; /// Data of all CIDs. + std::vector< XclPaletteColor > + maPalette; /// Contains resulting colors to export. sal_uInt32 mnLastIdx; /// Last insertion index for search opt. }; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 78c76fd34d65..6ab727e8993b 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -1753,8 +1753,7 @@ void XclExpColinfoBuffer::Finalize( ScfUInt16Vec& rXFIndexes, bool bXLS ) } // put XF indexes into passed vector, collect use count of all different widths - typedef ::std::map< sal_uInt16, sal_uInt16 > XclExpWidthMap; - XclExpWidthMap aWidthMap; + std::map< sal_uInt16, sal_uInt16 > aWidthMap; sal_uInt16 nMaxColCount = 0; sal_uInt16 nMaxUsedWidth = 0; for( nPos = 0, nSize = maColInfos.GetSize(); nPos < nSize; ++nPos ) @@ -1946,8 +1945,7 @@ void XclExpRow::Finalize( const ScfUInt16Vec& rColXFIndexes, bool bProgress ) // *** Find default row format *** ---------------------------------------- // find most used XF index in the row - typedef ::std::map< sal_uInt16, size_t > XclExpXFIndexMap; - XclExpXFIndexMap aIndexMap; + std::map< sal_uInt16, size_t > aIndexMap; sal_uInt16 nRowXFIndex = EXC_XF_DEFAULTCELL; size_t nMaxXFCount = 0; const size_t nHalfIndexes = aXFIndexes.size() / 2; @@ -2234,16 +2232,14 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt // *** Default row format *** --------------------------------------------- - typedef ::std::map< XclExpDefaultRowData, size_t > XclExpDefRowDataMap; - XclExpDefRowDataMap aDefRowMap; + std::map< XclExpDefaultRowData, size_t > aDefRowMap; XclExpDefaultRowData aMaxDefData; size_t nMaxDefCount = 0; // only look for default format in existing rows, if there are more than unused // if the row is hidden, then row xml must be created even if it not contain cells XclExpRow* pPrev = nullptr; - typedef std::vector< XclExpRow* > XclRepeatedRows; - XclRepeatedRows aRepeated; + std::vector< XclExpRow* > aRepeated; for (const auto& rEntry : maRowMap) { const RowRef& rRow = rEntry.second; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index c6ce9f58b9aa..0c2297cf8458 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -76,10 +76,9 @@ public: private: typedef std::shared_ptr< XclImpCrn > XclImpCrnRef; - typedef std::vector< XclImpCrnRef > XclImpCrnList; - XclImpCrnList maCrnList; /// List of CRN records (cached cell values). - OUString maTabName; /// Name of the external sheet. + std::vector< XclImpCrnRef > maCrnList; /// List of CRN records (cached cell values). + OUString maTabName; /// Name of the external sheet. }; } @@ -126,11 +125,11 @@ public: svl::SharedStringPool& GetSharedStringPool(); private: - typedef std::vector< std::unique_ptr<XclImpSupbookTab> > XclImpSupbookTabList; - typedef std::vector< std::unique_ptr<XclImpExtName> > XclImpExtNameList; - XclImpSupbookTabList maSupbTabList; /// All sheet names of the document. - XclImpExtNameList maExtNameList; /// All external names of the document. + std::vector< std::unique_ptr<XclImpSupbookTab> > + maSupbTabList; /// All sheet names of the document. + std::vector< std::unique_ptr<XclImpExtName> > + maExtNameList; /// All external names of the document. OUString maXclUrl; /// URL of the external document (Excel mode). XclSupbookType meType; /// Type of the supbook record. sal_uInt16 mnSBTab; /// Current Excel sheet index from SUPBOOK for XCT/CRN records. @@ -212,10 +211,10 @@ private: private: typedef std::vector< XclImpXti > XclImpXtiVector; - typedef std::vector< std::unique_ptr<XclImpSupbook> > XclImpSupbookList; XclImpXtiVector maXtiList; /// List of all XTI structures. - XclImpSupbookList maSupbookList; /// List of external documents. + std::vector< std::unique_ptr<XclImpSupbook> > + maSupbookList; /// List of external documents. }; // *** Implementation *** diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index a4d9355864e2..436e00e3b911 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1605,11 +1605,8 @@ struct IgnoreCaseCompare void XclImpXFBuffer::CreateUserStyles() { // calculate final names of all styles - typedef ::std::map< OUString, XclImpStyle*, IgnoreCaseCompare > CellStyleNameMap; - typedef ::std::vector< XclImpStyle* > XclImpStyleVector; - - CellStyleNameMap aCellStyles; - XclImpStyleVector aConflictNameStyles; + std::map< OUString, XclImpStyle*, IgnoreCaseCompare > aCellStyles; + std::vector< XclImpStyle* > aConflictNameStyles; /* First, reserve style names that are built-in in Calc. This causes that imported cell styles get different unused names and thus do not try to diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 0b29717b0bfe..93de32251f07 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -1499,8 +1499,7 @@ void XclNumFmtBuffer::InsertBuiltinFormats() } // insert the default formats in the format map, from root parent to system language - typedef ::std::map< sal_uInt16, sal_uInt16 > XclReuseMap; - XclReuseMap aReuseMap; + std::map< sal_uInt16, sal_uInt16 > aReuseMap; for( XclBuiltInVec::reverse_iterator aVIt = aBuiltInVec.rbegin(), aVEnd = aBuiltInVec.rend(); aVIt != aVEnd; ++aVIt ) { // put LANGUAGE_SYSTEM for all entries in default table |