summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r--sc/source/filter/inc/XclExpChangeTrack.hxx4
-rw-r--r--sc/source/filter/inc/sheetdatabuffer.hxx8
-rw-r--r--sc/source/filter/inc/tablebuffer.hxx6
-rw-r--r--sc/source/filter/inc/xechart.hxx17
-rw-r--r--sc/source/filter/inc/xecontent.hxx5
-rw-r--r--sc/source/filter/inc/xelink.hxx4
-rw-r--r--sc/source/filter/inc/xepivot.hxx17
-rw-r--r--sc/source/filter/inc/xestyle.hxx4
-rw-r--r--sc/source/filter/inc/xetable.hxx12
-rw-r--r--sc/source/filter/inc/xichart.hxx4
-rw-r--r--sc/source/filter/inc/xicontent.hxx4
-rw-r--r--sc/source/filter/inc/xiescher.hxx4
-rw-r--r--sc/source/filter/inc/xihelper.hxx4
-rw-r--r--sc/source/filter/inc/xipivot.hxx14
-rw-r--r--sc/source/filter/inc/xistream.hxx5
-rw-r--r--sc/source/filter/inc/xistyle.hxx14
16 files changed, 56 insertions, 70 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 5ac54f447bee..0d575324481b 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -587,11 +587,11 @@ public:
class XclExpChangeTrack : protected XclExpRoot
{
typedef std::vector<std::unique_ptr<ExcRecord>> RecListType;
- typedef std::vector<std::unique_ptr<XclExpChTrTabIdBuffer>> TabIdBufferType;
RecListType maRecList; // list of "Revision Log" stream records
std::stack<XclExpChTrAction*> aActionStack;
XclExpChTrTabIdBuffer* pTabIdBuffer;
- TabIdBufferType maBuffers;
+ std::vector<std::unique_ptr<XclExpChTrTabIdBuffer>>
+ maBuffers;
ScDocumentUniquePtr xTempDoc; // empty document
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx
index ae9c3f4a6710..1539b29b43ee 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -175,7 +175,6 @@ private:
/** Stores cell range address and settings of a table operation. */
typedef std::pair< ScRange, DataTableModel > TableOperation;
- typedef ::std::vector< TableOperation > TableOperationVector;
/** Stores information about a range of rows with equal cell formatting. */
struct XfIdRowRange
@@ -189,7 +188,6 @@ private:
};
typedef ::std::pair< sal_Int32, sal_Int32 > XfIdNumFmtKey;
- typedef ::std::map< XfIdNumFmtKey, ScRangeList > XfIdRangeListMap;
struct RowRangeStyle
{
@@ -221,13 +219,15 @@ private:
ColStyles maStylesPerColumn; /// Stores cell styles by column ( in row ranges )
CellBlockBuffer maCellBlocks; /// Manages all open cell blocks.
ArrayFormulaVector maArrayFormulas; /// All array formulas in the sheet.
- TableOperationVector maTableOperations; /// All table operations in the sheet.
+ std::vector< TableOperation >
+ maTableOperations; /// All table operations in the sheet.
::std::map< BinAddress, ApiTokenSequence >
maSharedFormulas; /// Maps shared formula base address to defined name token index.
ScAddress maSharedFmlaAddr; /// Address of a cell containing a pending shared formula.
ScAddress maSharedBaseAddr; /// Base address of the pending shared formula.
XfIdRowRange maXfIdRowRange; /// Cached XF identifier for a range of rows.
- XfIdRangeListMap maXfIdRangeLists; /// Collected XF identifiers for cell rangelists.
+ std::map< XfIdNumFmtKey, ScRangeList >
+ maXfIdRangeLists; /// Collected XF identifiers for cell rangelists.
MergedRangeVector maMergedRanges; /// Merged cell ranges.
MergedRangeVector maCenterFillRanges; /// Merged cell ranges from 'center across' or 'fill' alignment.
bool mbPendingSharedFmla; /// True = maSharedFmlaAddr and maSharedBaseAddr are valid.
diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx
index 43a87b9b87a9..af1fc6334056 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -115,12 +115,10 @@ private:
private:
typedef RefVector< Table > TableVector;
- typedef RefMap< sal_Int32, Table > TableIdMap;
- typedef RefMap< OUString, Table > TableNameMap;
TableVector maTables;
- TableIdMap maIdTables;
- TableNameMap maNameTables;
+ RefMap< sal_Int32, Table > maIdTables;
+ RefMap< OUString, Table > maNameTables;
};
} // namespace xls
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 6d66615aaf03..5e45b4d07878 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -742,7 +742,6 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) override;
private:
- typedef XclExpRecordList< XclExpChDataFormat > XclExpChDataFormatList;
private:
XclChSeries maData; /// Contents of the CHSERIES record.
@@ -751,7 +750,8 @@ private:
XclExpChSourceLinkRef mxCategLink; /// Link data for series category names.
XclExpChSourceLinkRef mxBubbleLink; /// Link data for series bubble sizes.
XclExpChDataFormatRef mxSeriesFmt; /// CHDATAFORMAT group for series format.
- XclExpChDataFormatList maPointFmts; /// CHDATAFORMAT groups for data point formats.
+ XclExpRecordList< XclExpChDataFormat >
+ maPointFmts; /// CHDATAFORMAT groups for data point formats.
XclExpChSerTrendLineRef mxTrendLine; /// Trend line settings (CHSERTRENDLINE record).
XclExpChSerErrorBarRef mxErrorBar; /// Error bar settings (CHSERERRORBAR record).
sal_uInt16 mnGroupIdx; /// Chart type group (CHTYPEGROUP group) this series is assigned to.
@@ -925,7 +925,6 @@ private:
private:
typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList;
- typedef ::std::map<sal_uInt16, std::unique_ptr<XclExpChLineFormat>> XclExpChLineFormatMap;
XclChTypeGroup maData; /// Contents of the CHTYPEGROUP record.
XclExpChType maType; /// Chart type (e.g. CHBAR, CHLINE, ...).
@@ -935,7 +934,8 @@ private:
XclExpChLegendRef mxLegend; /// Chart legend (CHLEGEND group).
XclExpChDropBarRef mxUpBar; /// White dropbars (CHDROPBAR group).
XclExpChDropBarRef mxDownBar; /// Black dropbars (CHDROPBAR group).
- XclExpChLineFormatMap m_ChartLines; /// Global line formats (CHCHARTLINE group).
+ std::map<sal_uInt16, std::unique_ptr<XclExpChLineFormat>>
+ m_ChartLines; /// Global line formats (CHCHARTLINE group).
};
typedef rtl::Reference< XclExpChTypeGroup > XclExpChTypeGroupRef;
@@ -1102,8 +1102,6 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) override;
private:
- typedef XclExpRecordList< XclExpChTypeGroup > XclExpChTypeGroupList;
-
XclChAxesSet maData; /// Contents of the CHAXESSET record.
XclExpChFramePosRef mxFramePos; /// Outer plot area position (CHFRAMEPOS record).
XclExpChAxisRef mxXAxis; /// The X axis (CHAXIS group).
@@ -1113,7 +1111,8 @@ private:
XclExpChTextRef mxYAxisTitle; /// The Y axis title (CHTEXT group).
XclExpChTextRef mxZAxisTitle; /// The Z axis title (CHTEXT group).
XclExpChFrameRef mxPlotFrame; /// Plot area (CHPLOTFRAME group).
- XclExpChTypeGroupList maTypeGroups; /// Chart type groups (CHTYPEGROUP group).
+ XclExpRecordList< XclExpChTypeGroup >
+ maTypeGroups; /// Chart type groups (CHTYPEGROUP group).
};
typedef std::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef;
@@ -1150,7 +1149,6 @@ private:
private:
typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList;
- typedef XclExpRecordList< XclExpChText > XclExpChTextList;
XclChRectangle maRect; /// Position of the chart on the sheet (CHCHART record).
XclExpChSeriesList maSeries; /// List of series data (CHSERIES groups).
@@ -1159,7 +1157,8 @@ private:
XclExpChAxesSetRef mxPrimAxesSet; /// Primary axes set (CHAXESSET group).
XclExpChAxesSetRef mxSecnAxesSet; /// Secondary axes set (CHAXESSET group).
XclExpChTextRef mxTitle; /// Chart title (CHTEXT group).
- XclExpChTextList maLabels; /// Data point labels (CHTEXT groups).
+ XclExpRecordList< XclExpChText >
+ maLabels; /// Data point labels (CHTEXT groups).
};
/** Represents the group of DFF and OBJ records containing all drawing shapes
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 56af63f8fff4..bc873e81466d 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -239,9 +239,8 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) override;
private:
- typedef XclExpRecordList< XclExpRecord > XclExpCFList;
-
- XclExpCFList maCFList; /// List of CF records.
+ XclExpRecordList< XclExpRecord >
+ maCFList; /// List of CF records.
XclRangeList maXclRanges; /// Cell ranges for this conditional format.
OUString msSeqRef; /// OOXML Sequence of References
};
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index df585bc306a3..bf6b4571b890 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -122,10 +122,10 @@ private:
explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {}
};
- typedef ::std::vector< XclExpTabInfoEntry > XclExpTabInfoVec;
typedef ::std::vector< SCTAB > ScTabVec;
- XclExpTabInfoVec maTabInfoVec; /// Array of Calc sheet index information.
+ std::vector< XclExpTabInfoEntry >
+ maTabInfoVec; /// Array of Calc sheet index information.
SCTAB mnScCnt; /// Count of Calc sheets.
sal_uInt16 mnXclCnt; /// Count of Excel sheets to be exported.
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 98fbdf52e8a5..d508e7135c1d 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -303,16 +303,16 @@ private:
void WriteSxvdex( XclExpStream& rStrm ) const;
private:
- typedef ::std::vector< XclPTDataFieldInfo > XclPTDataFieldInfoVec;
- typedef XclExpRecordList< XclExpPTItem > XclExpPTItemList;
const XclExpPivotTable& mrPTable; /// Parent pivot table containing this field.
const XclExpPCField* mpCacheField; /// The referred pivot cache field.
XclPTFieldInfo maFieldInfo; /// General field info (SXVD record).
XclPTFieldExtInfo maFieldExtInfo; /// Extended field info (SXVDEX record).
XclPTPageFieldInfo maPageInfo; /// Page field info (entry in SXPI record).
- XclPTDataFieldInfoVec maDataInfoVec; /// List of extended data field info (SXDI records).
- XclExpPTItemList maItemList; /// List of all items of this field.
+ std::vector< XclPTDataFieldInfo >
+ maDataInfoVec; /// List of extended data field info (SXDI records).
+ XclExpRecordList< XclExpPTItem >
+ maItemList; /// List of all items of this field.
};
class XclExpPivotTable : public XclExpRecordBase, protected XclExpRoot
@@ -379,7 +379,6 @@ private:
private:
typedef XclExpRecordList< XclExpPTField > XclExpPTFieldList;
typedef XclExpPTFieldList::RecordRefType XclExpPTFieldRef;
- typedef ::std::vector< XclPTDataFieldPos > XclPTDataFieldPosVec;
const XclExpPivotCache& mrPCache; /// The pivot cache this pivot table bases on.
XclPTInfo maPTInfo; /// Info about the pivot table (SXVIEW record).
@@ -389,7 +388,8 @@ private:
ScfUInt16Vec maRowFields; /// Row field indexes.
ScfUInt16Vec maColFields; /// Column field indexes.
ScfUInt16Vec maPageFields; /// Page field indexes.
- XclPTDataFieldPosVec maDataFields; /// Data field indexes.
+ std::vector< XclPTDataFieldPos >
+ maDataFields; /// Data field indexes.
XclExpPTField maDataOrientField; /// Special data field orientation field.
SCTAB mnOutScTab; /// Sheet index of the output range.
bool mbValid; /// true = The pivot table is valid for export.
@@ -427,12 +427,11 @@ private:
const XclExpPivotCache* CreatePivotCache( const ScDPObject& rDPObj );
private:
- typedef XclExpRecordList< XclExpPivotCache > XclExpPivotCacheList;
typedef XclExpRecordList< XclExpPivotTable > XclExpPivotTableList;
typedef XclExpPivotTableList::RecordRefType XclExpPivotTableRef;
- XclExpPivotCacheList maPCacheList; /// List of all pivot caches.
- XclExpPivotTableList maPTableList; /// List of all pivot tables.
+ XclExpRecordList< XclExpPivotCache > maPCacheList; /// List of all pivot caches.
+ XclExpPivotTableList maPTableList; /// List of all pivot tables.
};
#endif
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 7e6d521f5cf6..de6bd2cb9b78 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -629,7 +629,6 @@ public:
private:
typedef XclExpRecordList< XclExpXF > XclExpXFList;
typedef XclExpXFList::RecordRefType XclExpXFRef;
- typedef XclExpRecordList< XclExpStyle > XclExpStyleList;
private:
/** Returns the XF ID of the cell XF containing the passed format. */
@@ -709,7 +708,8 @@ private:
XclExpXFList maXFList; /// List of all XF records.
std::map<FindKey, std::vector<sal_uInt32>>
maXFFindMap; /// map of itemset to vector of positions, to speed up find
- XclExpStyleList maStyleList; /// List of all STYLE records.
+ XclExpRecordList< XclExpStyle >
+ maStyleList; /// List of all STYLE records.
XclExpBuiltInMap maBuiltInMap; /// Contained elements describe built-in XFs.
ScfUInt16Vec maXFIndexVec; /// Maps XF IDs to XF indexes.
ScfUInt16Vec maStyleIndexes; /// Maps XF IDs to OOXML Style indexes
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 50b4d248ab5b..e5414a361d5e 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -264,8 +264,7 @@ private:
XclExpTableopRef TryCreate( const ScAddress& rScPos, const XclMultipleOpRefs& rRefs );
private:
- typedef XclExpRecordList< XclExpTableop > XclExpTableopList;
- XclExpTableopList maTableopList; /// List of all TABLEOP records.
+ XclExpRecordList< XclExpTableop > maTableopList; /// List of all TABLEOP records.
};
// Cell records
@@ -590,10 +589,10 @@ private:
bool mbHidden; /// true = Group in this level is hidden.
explicit XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {}
};
- typedef ::std::vector< XclExpLevelInfo > XclExpLevelInfoVec;
const ScOutlineArray* mpScOLArray; /// Pointer to Calc outline array.
- XclExpLevelInfoVec maLevelInfos; /// Info for current row and all levels.
+ std::vector< XclExpLevelInfo >
+ maLevelInfos; /// Info for current row and all levels.
sal_uInt8 mnCurrLevel; /// Highest level of an open group for current position.
bool mbCurrCollapse; /// true = Collapsed group ends at current position.
};
@@ -883,9 +882,8 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) override;
private:
- typedef XclExpRecordList< XclExpCellBase > XclExpCellList;
-
- XclExpCellList maCellList; /// List of cell records for this row.
+ XclExpRecordList< XclExpCellBase >
+ maCellList; /// List of cell records for this row.
sal_uInt32 mnXclRow; /// Excel row index of this row.
sal_uInt16 mnHeight; /// Row height in twips.
sal_uInt16 mnFlags; /// Flags for the ROW record.
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 8641015f3741..0eea6b8a35f2 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1064,7 +1064,6 @@ private:
typedef ::std::vector< XclImpChSeriesRef > XclImpChSeriesVec;
typedef ::std::map<sal_uInt16, std::unique_ptr<XclImpChDropBar>> XclImpChDropBarMap;
typedef ::std::map<sal_uInt16, XclImpChLineFormat> XclImpChLineFormatMap;
- typedef ::std::set< sal_uInt16 > UInt16Set;
XclChTypeGroup maData; /// Contents of the CHTYPEGROUP record.
XclImpChType maType; /// Chart type (e.g. CHBAR, CHLINE, ...).
@@ -1076,7 +1075,8 @@ private:
XclImpChDropBarMap m_DropBars; /// Dropbars (CHDROPBAR group).
XclImpChLineFormatMap m_ChartLines; /// Global line formats (CHCHARTLINE group).
XclImpChDataFormatRef mxGroupFmt; /// Default format for all series (CHDATAFORMAT group).
- UInt16Set maUnusedFormats; /// Contains unused format indexes for automatic colors.
+ std::set< sal_uInt16 >
+ maUnusedFormats; /// Contains unused format indexes for automatic colors.
};
typedef std::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 4a6b53dc8fa1..8f3fdc183696 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -159,8 +159,8 @@ public:
void Apply();
private:
- typedef std::vector< std::unique_ptr<XclImpCondFormat> > XclImpCondFmtList;
- XclImpCondFmtList maCondFmtList; /// List with all conditional formatting.
+ std::vector< std::unique_ptr<XclImpCondFormat> >
+ maCondFmtList; /// List with all conditional formatting.
};
// Data Validation ============================================================
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 1cc859944954..e3e2a953da51 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1026,11 +1026,11 @@ private:
private:
typedef std::shared_ptr< ScfProgressBar > ScfProgressBarRef;
typedef std::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef;
- typedef std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack;
tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream for OCX form controls.
ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj().
- XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers.
+ std::vector< XclImpDffConvDataRef >
+ maDataStack; /// Stack for registered drawing managers.
sal_uInt32 mnOleImpFlags; /// Application OLE import settings.
sal_Int32 mnDefTextMargin; /// Default margin in text boxes.
bool mbNotifyMacroEventRead; /// If we have already seen a macro event
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index ae600e850317..c100e0ba2ef1 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -196,7 +196,6 @@ private: // types
sal_uInt16 mnMaxLineHt; /// Maximum font height for the current text line.
explicit XclImpHFPortionInfo();
};
- typedef ::std::vector< XclImpHFPortionInfo > XclImpHFPortionInfoVec;
private:
/** Returns the current edit engine text object. */
@@ -238,7 +237,8 @@ private:
private:
EditEngine& mrEE; /// The header/footer edit engine.
- XclImpHFPortionInfoVec maInfos; /// Edit engine text objects for all portions.
+ std::vector< XclImpHFPortionInfo >
+ maInfos; /// Edit engine text objects for all portions.
OUStringBuffer maCurrText; /// Current text to insert into edit engine.
XclFontDataPtr mxFontData; /// Font data of current text.
XclImpHFPortion meCurrObj; /// The current portion.
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index f6fa56d3cc0b..97bb01ad69e3 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -279,14 +279,13 @@ private:
void ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const;
private:
- typedef ::std::vector< XclImpPTItemRef > XclImpPTItemVec;
const XclImpPivotTable& mrPTable; /// Parent pivot table containing this field.
XclPTFieldInfo maFieldInfo; /// General field info (SXVD record).
XclPTFieldExtInfo maFieldExtInfo; /// Extended field info (SXVDEX record).
XclPTPageFieldInfo maPageInfo; /// Page field info (entry from SXPI record).
std::vector< XclPTDataFieldInfo > maDataInfoVector; /// Vector of extended data field info (SXDI records).
- XclImpPTItemVec maItems; /// List of all items of this field.
+ std::vector< XclImpPTItemRef > maItems; /// List of all items of this field.
};
typedef std::shared_ptr< XclImpPTField > XclImpPTFieldRef;
@@ -343,15 +342,14 @@ public:
void ApplyFieldInfo();
private:
- typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec;
-
XclImpPivotCacheRef mxPCache; /// Pivot cache containing field/item names.
XclPTInfo maPTInfo; /// General info about the pivot table (SXVIEW record).
XclPTExtInfo maPTExtInfo; /// Extended info about the pivot table (SXEX record).
XclPTViewEx9Info maPTViewEx9Info; /// (SXVIEWEX9 record)
XclPTAddl maPTAddlInfo;
- XclImpPTFieldVec maFields; /// Vector containing all fields.
+ std::vector< XclImpPTFieldRef >
+ maFields; /// Vector containing all fields.
XclImpPTFieldRef mxCurrField; /// Current field for importing additional info.
ScfStringVec maVisFieldNames; /// Vector containing all visible field names.
ScfUInt16Vec maRowFields; /// Row field indexes.
@@ -422,11 +420,9 @@ public:
void MaybeRefreshPivotTables();
private:
- typedef ::std::vector< XclImpPivotCacheRef > XclImpPivotCacheVec;
- typedef ::std::vector< XclImpPivotTableRef > XclImpPivotTableVec;
- XclImpPivotCacheVec maPCaches; /// List of all pivot caches.
- XclImpPivotTableVec maPTables; /// List of all pivot tables.
+ std::vector< XclImpPivotCacheRef > maPCaches; /// List of all pivot caches.
+ std::vector< XclImpPivotTableRef > maPTables; /// List of all pivot tables.
};
#endif
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index c752f00f8531..a7e33a111ea9 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -515,15 +515,14 @@ private:
sal_uInt16 ReadRawData( void* pData, sal_uInt16 nBytes );
private:
- typedef ::std::vector< XclImpStreamPos > XclImpStreamPosStack;
-
SvStream& mrStrm; /// Reference to the system input stream.
const XclImpRoot& mrRoot; /// Filter root data.
XclImpDecrypterRef mxDecrypter; /// Provides methods to decrypt data.
XclImpStreamPos maFirstRec; /// Start position of current record.
- XclImpStreamPosStack maPosStack; /// Stack for record positions.
+ std::vector< XclImpStreamPos >
+ maPosStack; /// Stack for record positions.
XclImpStreamPos maGlobPos; /// User defined position elsewhere in stream.
sal_uInt16 mnGlobRecId; /// Record ID for user defined position.
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index ee6664162fbf..0cc01ec528d7 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -659,14 +659,12 @@ private:
void SetBorderLine( const ScRange& rRange, SCTAB nScTab, SvxBoxItemLine nLine );
private:
- typedef std::shared_ptr< XclImpXFRangeColumn > XclImpXFRangeColumnRef;
- typedef ::std::vector< XclImpXFRangeColumnRef > XclImpXFRangeColumnVec;
- typedef ::std::pair< XclRange, OUString > XclImpHyperlinkRange;
- typedef ::std::vector< XclImpHyperlinkRange > XclImpHyperlinkVector;
-
- XclImpXFRangeColumnVec maColumns; /// Array of column XF index buffers.
- XclImpHyperlinkVector maHyperlinks; /// Maps URLs to hyperlink cells.
- ScRangeList maMergeList; /// List of merged cell ranges.
+
+ std::vector< std::shared_ptr< XclImpXFRangeColumn > >
+ maColumns; /// Array of column XF index buffers.
+ std::vector< std::pair< XclRange, OUString > >
+ maHyperlinks; /// Maps URLs to hyperlink cells.
+ ScRangeList maMergeList; /// List of merged cell ranges.
};
#endif
generated by cgit (git 2.34.1) at 2024-07-27 06:43:15 +0000