diff options
60 files changed, 153 insertions, 234 deletions
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 1d6d9de1d5eb..6827bf755d0d 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -359,16 +359,11 @@ public: virtual void Clear() override; }; -typedef std::unordered_map< OUString, css::uno::Any > VBAConstantsHash; - -typedef std::vector< OUString > VBAConstantsVector; - class VBAConstantHelper { private: - - VBAConstantsVector aConstCache; - VBAConstantsHash aConstHash; + std::vector< OUString > aConstCache; + std::unordered_map< OUString, css::uno::Any > aConstHash; bool isInited; VBAConstantHelper():isInited( false ) {} VBAConstantHelper(const VBAConstantHelper&) = delete; diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 1d6e57d1913c..77bf0555ec97 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -233,8 +233,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( if( !bFormatSet ) { - typedef std::map< sal_Int32, sal_Int32 > tNumberformatFrequency; - tNumberformatFrequency aKeyMap; + std::map< sal_Int32, sal_Int32 > aKeyMap; bool bNumberFormatKeyFoundViaAttachedData = false; try diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6d9845bbc1b8..aa87abb4f2c9 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -61,8 +61,7 @@ public: private: typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; - typedef std::map< tFullAxisIndex, sal_Int32 > tNumberFormatMap; - tNumberFormatMap m_aNumberFormatMap; + std::map< tFullAxisIndex, sal_Int32 > m_aNumberFormatMap; }; /** diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 87b8116d1d7f..014c5c7f6b62 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -138,8 +138,6 @@ private: int getExtensionLayer(bool shared) const; - typedef o3tl::sorted_vector< RootAccess * > WeakRootSet; - typedef config_map< css::uno::Reference< @@ -153,7 +151,7 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; Data data_; - WeakRootSet roots_; + o3tl::sorted_vector< RootAccess * > roots_; ExternalServices externalServices_; rtl::Reference< WriteThread > writeThread_; int sharedExtensionLayer_; diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 859b61ddcf9f..67d2b081d3c2 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -152,10 +152,9 @@ namespace connectivity class MQueryHelper final { private: - typedef std::vector< std::unique_ptr<MQueryHelperResultEntry> > resultsArray; mutable ::osl::Mutex m_aMutex; - resultsArray m_aResults; + std::vector< std::unique_ptr<MQueryHelperResultEntry> > m_aResults; void append(std::unique_ptr<MQueryHelperResultEntry> resEnt ); void clear_results(); OColumnAlias m_rColumnAlias; diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 5fc1ab82eb9c..1e8655a99b58 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -146,8 +146,6 @@ typedef std::unordered_map< typedef std::unordered_map< uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry; -typedef set< uno_getMappingFunc > t_CallbackSet; - namespace { struct MappingsData @@ -157,7 +155,8 @@ struct MappingsData t_Mapping2Entry aMapping2Entry; Mutex aCallbacksMutex; - t_CallbackSet aCallbacks; + set< uno_getMappingFunc > + aCallbacks; Mutex aNegativeLibsMutex; set<OUString> aNegativeLibs; diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 79c5c58696d3..b939cb95715f 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -168,8 +168,6 @@ public: typedef std::unordered_map< OUString, UCharSet > UCharSetMap; typedef std::unordered_map< Reference< XInterface >, UCharSetMap > UCharSetMapMap; - typedef std::unordered_map< Reference< XInterface >, OUString > UOStringMap; - typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; private: @@ -206,7 +204,8 @@ private: OUString msClipPathId; UCharSetMapMap mTextFieldCharSets; Reference< XInterface > mCreateOjectsCurrentMasterPage; - UOStringMap mTextShapeIdListMap; + std::unordered_map< Reference< XInterface >, OUString > + mTextShapeIdListMap; MetaBitmapActionSet mEmbeddedBitmapActionSet; ObjectMap mEmbeddedBitmapActionMap; std::vector< Reference< css::drawing::XDrawPage > > mMasterPageTargets; diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 23144a8fd5d5..3f2760babbad 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -142,10 +142,10 @@ private: explicit Transformation( sal_Int32 nToken, sal_Int32 nValue ) : mnToken( nToken ), mnValue( nValue ) {} }; - typedef ::std::vector< Transformation > TransformVec; mutable ColorMode meMode; /// Current color mode. - mutable TransformVec maTransforms; /// Color transformations. + mutable std::vector< Transformation > + maTransforms; /// Color transformations. mutable sal_Int32 mnC1; /// Red, red%, hue, scheme token, palette index, system token, or final RGB. mutable sal_Int32 mnC2; /// Green, green%, saturation, or system default RGB. mutable sal_Int32 mnC3; /// Blue, blue%, or luminance. diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index bab5eb4a077f..f3cdf0c0ca87 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -366,10 +366,10 @@ private: explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : maItemName( rItemName ), mnData( nData ) {} }; - typedef ::std::vector< StreamProperty > StreamPropertyVector; LargePropertyVector maLargeProps; - StreamPropertyVector maStreamProps; + std::vector< StreamProperty > + maStreamProps; NameListRef mxPropNames; sal_Int64 mnPropertiesStart; sal_Int64 mnPropertiesEnd; @@ -548,13 +548,11 @@ struct VbaFormSiteInfo VbaFormSiteInfo() : mnId( 0 ), mnLength( 0 ), mbInStream( false ) {} }; -typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; - struct VbaFormSharedData { - OUStringVector maClassInfoProgIds; - VbaFormSiteInfoVector maSiteInfos; + OUStringVector maClassInfoProgIds; + std::vector< VbaFormSiteInfo > maSiteInfos; }; diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index 91fa5cdb0967..cc4705e6a046 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -77,9 +77,8 @@ private: static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength ); static const css::uno::Sequence< sal_Int8 > EMPTY_BYTE_SEQ; - typedef ::std::vector< css::uno::Sequence< sal_Int8 > > TokenNameVector; - - TokenNameVector maTokenNames; + std::vector< css::uno::Sequence< sal_Int8 > > + maTokenNames; sal_Int32 mnAlphaTokens[26]; }; diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index f937ab1abb4f..8b8138d82e9b 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -47,8 +47,6 @@ struct UnknownAttribute void FillAttribute( css::xml::Attribute* pAttrib ) const; }; -typedef std::vector< UnknownAttribute > UnknownAttributeList; - /// A native C++ interface to tokenisation class SAX_DLLPUBLIC FastTokenHandlerBase : public cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler > @@ -200,7 +198,7 @@ private: // maAttributeValues[0] == 0 std::vector< sal_Int32 > maAttributeValues; std::vector< sal_Int32 > maAttributeTokens; - UnknownAttributeList maUnknownAttributes; + std::vector< UnknownAttribute > maUnknownAttributes; FastTokenHandlerBase * mpTokenHandler; }; diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx index add32fffcada..041588f6fc11 100644 --- a/include/svtools/insdlg.hxx +++ b/include/svtools/insdlg.hxx @@ -41,12 +41,10 @@ public: const OUString & GetHumanName() const { return aHumanName; } }; -typedef ::std::vector< SvObjectServer > SvObjectServerList_impl; - class SVT_DLLPUBLIC SvObjectServerList { private: - SvObjectServerList_impl aObjectServerList; + std::vector< SvObjectServer > aObjectServerList; public: const SvObjectServer * Get( const OUString & rHumanName ) const; diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 89122f51c75d..3152fa3bed56 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -222,12 +222,10 @@ struct SystemFontData #endif // ENABLE_CAIRO_CANVAS -typedef std::vector<SystemGlyphData> SystemGlyphDataVector; - struct SystemTextLayoutData { - SystemGlyphDataVector rGlyphData; // glyph data - int orientation; // Text orientation + std::vector<SystemGlyphData> rGlyphData; // glyph data + int orientation; // Text orientation }; #endif // INCLUDED_VCL_SYSDATA_HXX diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 59e99289b45e..d8f7b564904d 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -138,10 +138,9 @@ OOX_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp struct ConverterData { - typedef ::std::map< TitleKey, TitleLayoutInfo > TitleMap; - ObjectFormatter maFormatter; - TitleMap maTitles; + std::map< TitleKey, TitleLayoutInfo > + maTitles; XmlFilterBase& mrFilter; ChartConverter& mrConverter; Reference< XChartDocument > mxDoc; diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 55eb9020ae11..8313d6d5cffc 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -1028,9 +1028,8 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper(); // Bezier paths may consist of one or more sub-paths - typedef ::std::vector< ::std::vector< awt::Point > > SubPathList; typedef ::std::vector< ::std::vector< PolygonFlags > > FlagsList; - SubPathList aCoordLists; + std::vector< ::std::vector< awt::Point > > aCoordLists; FlagsList aFlagLists; sal_Int32 nIndex = 0; diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index ae0802f65c0c..017ee528e616 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -72,8 +72,6 @@ using namespace ::com::sun::star; #define THROW_WHERE "" #endif -typedef ::std::vector< uno::WeakReference< lang::XComponent > > WeakComponentVector; - struct StorInternalData_Impl { rtl::Reference<comphelper::RefCountedMutex> m_xSharedMutex; @@ -85,7 +83,7 @@ struct StorInternalData_Impl ::rtl::Reference<OChildDispListener_Impl> m_pSubElDispListener; - WeakComponentVector m_aOpenSubComponentsVector; + ::std::vector< uno::WeakReference< lang::XComponent > > m_aOpenSubComponentsVector; ::rtl::Reference< OHierarchyHolder_Impl > m_rHierarchyHolder; diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index a54ef671db17..6e19a36838f4 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -92,8 +92,6 @@ public: SotElement_Impl(const OUString& rName, bool bStor, bool bNew); }; -typedef ::std::vector< SotElement_Impl* > SotElementVector_Impl; - // Main storage implementation class OStorage; @@ -133,7 +131,7 @@ struct OStorage_Impl } std::unordered_map<OUString, std::vector<SotElement_Impl*>> m_aChildrenMap; - SotElementVector_Impl m_aDeletedVector; + std::vector< SotElement_Impl* > m_aDeletedVector; css::uno::Reference< css::container::XNameContainer > m_xPackageFolder; diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 3353f17576fc..4b4842966ac6 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -142,20 +142,19 @@ class ScTabViewObj final : public ScViewPaneBase, public css::sheet::XSelectedSheetsSupplier { private: - typedef std::vector<css::uno::Reference<css::sheet::XRangeSelectionListener> > XRangeSelectionListenerVector; - typedef std::vector<css::uno::Reference<css::sheet::XRangeSelectionChangeListener> > XRangeSelectionChangeListenerVector; - typedef std::vector<css::uno::Reference<css::view::XSelectionChangeListener> > XSelectionChangeListenerVector; - typedef std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > XViewPropertyChangeListenerVector; - typedef std::vector<css::uno::Reference<css::awt::XEnhancedMouseClickHandler> > XMouseClickHandlerVector; - typedef std::vector<css::uno::Reference<css::sheet::XActivationEventListener> > XActivationEventListenerVector; - SfxItemPropertySet aPropSet; - XSelectionChangeListenerVector aSelectionChgListeners; - XRangeSelectionListenerVector aRangeSelListeners; - XRangeSelectionChangeListenerVector aRangeChgListeners; - XViewPropertyChangeListenerVector aPropertyChgListeners; - XMouseClickHandlerVector aMouseClickHandlers; - XActivationEventListenerVector aActivationListeners; + std::vector<css::uno::Reference<css::view::XSelectionChangeListener> > + aSelectionChgListeners; + std::vector<css::uno::Reference<css::sheet::XRangeSelectionListener> > + aRangeSelListeners; + std::vector<css::uno::Reference<css::sheet::XRangeSelectionChangeListener> > + aRangeChgListeners; + std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > + aPropertyChgListeners; + std::vector<css::uno::Reference<css::awt::XEnhancedMouseClickHandler> > + aMouseClickHandlers; + std::vector<css::uno::Reference<css::sheet::XActivationEventListener> > + aActivationListeners; SCTAB nPreviousTab; bool bDrawSelModeSet; bool bFilteredRangeSelection; 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 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 diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index f639a3d742b5..1178d5ee59a5 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -545,7 +545,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved ) uno::Reference< uno::XInterface > xSource(xView, uno::UNO_QUERY); aEvent.Source = xSource; aEvent.ActiveSheet = new ScTableSheetObj(pDocSh, rViewData.GetTabNo()); - for (XActivationEventListenerVector::iterator it = aActivationListeners.begin(); it != aActivationListeners.end(); ) + for (auto it = aActivationListeners.begin(); it != aActivationListeners.end(); ) { try { @@ -1155,7 +1155,7 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) aMouseEvent.Target = xTarget; aMouseEvent.Modifiers = e.Modifiers; - for (XMouseClickHandlerVector::iterator it = aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); ) + for (auto it = aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); ) { try { @@ -1265,7 +1265,7 @@ bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) aMouseEvent.Target = xTarget; aMouseEvent.Modifiers = e.Modifiers; - for (XMouseClickHandlerVector::iterator it = aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); ) + for (auto it = aMouseClickHandlers.begin(); it != aMouseClickHandlers.end(); ) { try { @@ -2006,7 +2006,7 @@ void ScTabViewObj::RangeSelDone( const OUString& rText ) aEvent.RangeDescriptor = rText; // copy on the stack because listener could remove itself - XRangeSelectionListenerVector const listeners(aRangeSelListeners); + auto const listeners(aRangeSelListeners); for (const auto& rListener : listeners) rListener->done( aEvent ); @@ -2019,7 +2019,7 @@ void ScTabViewObj::RangeSelAborted( const OUString& rText ) aEvent.RangeDescriptor = rText; // copy on the stack because listener could remove itself - XRangeSelectionListenerVector const listeners(aRangeSelListeners); + auto const listeners(aRangeSelListeners); for (const auto& rListener : listeners) rListener->aborted( aEvent ); @@ -2032,7 +2032,7 @@ void ScTabViewObj::RangeSelChanged( const OUString& rText ) aEvent.RangeDescriptor = rText; // copy on the stack because listener could remove itself - XRangeSelectionChangeListenerVector const listener(aRangeChgListeners); + auto const listener(aRangeChgListeners); for (const auto& rListener : listener) rListener->descriptorChanged( aEvent ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 17946aed3fbf..9a7e2b5f93b5 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1833,7 +1833,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations if ( !bNewAnimationsUsed ) { - tAnimationVector aAnimationsOnThisPage; + std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > aAnimationsOnThisPage; // add effects from page in correct order SdrObjListIter aSdrIter( pPage, SdrIterMode::Flat ); diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 4843bdf13507..02c22e652350 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -40,7 +40,6 @@ class Ppt97Animation; typedef std::shared_ptr< Ppt97Animation > Ppt97AnimationPtr; typedef ::std::map < SdrObject*, Ppt97AnimationPtr > tAnimationMap; -typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVector; class ImplSdPPTImport : public SdrPowerPointImport { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b3c604bc97b3..dbb4eddc81b9 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -81,7 +81,6 @@ struct WrappedShapeEventImpl }; typedef std::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; -typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > @@ -323,7 +322,8 @@ private: bool mbUsePen; double mdUserPaintStrokeWidth; - WrappedShapeEventImplMap maShapeEventMap; + std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > + maShapeEventMap; css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage; css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 4fd3464e6d23..8186800ec613 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -177,11 +177,10 @@ static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = { also handles one instance of the SysLocale options */ -typedef ::std::vector< SvNumberFormatter* > SvNumberFormatterList_impl; - class SvNumberFormatterRegistry_Impl : public utl::ConfigurationListener { - SvNumberFormatterList_impl aFormatters; + std::vector< SvNumberFormatter* > + aFormatters; SvtSysLocaleOptions aSysLocaleOptions; LanguageType eSysLanguage; diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index f7106c125136..095edb0b5e4a 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -36,8 +36,6 @@ struct TableEdge TableEdge() : mnStart(0), mnEnd(0), meState(Empty) {} }; -typedef std::vector< TableEdge > TableEdgeVector; - class TableEdgeHdl : public SdrHdl { public: @@ -61,7 +59,7 @@ protected: private: bool mbHorizontal; sal_Int32 mnMin, mnMax; - TableEdgeVector maEdges; + std::vector< TableEdge > maEdges; }; class TableBorderHdl : public SdrHdl diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index fc0a7abb5dfa..b9f92982129a 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -typedef o3tl::sorted_vector<SwFormat*> SwpFormats; - // Special case for SvxFontItem: only compare the name static bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 ) { @@ -1049,7 +1047,7 @@ static bool FindAttrsImpl(SwPaM & rSearchPam, bool bFirst = true; const bool bSrchForward = &fnMove == &fnMoveForward; SwContentNode * pNode; - SwpFormats aFormatArr; + o3tl::sorted_vector<SwFormat*> aFormatArr; // check which text/char attributes are searched SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls ); diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 6e907d7495c7..a174dccbbee1 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -238,8 +238,7 @@ namespace sw const SwPosition &rStt = *rPam.Start(), &rEnd = *rPam.End(); SwPosition const*const pCpyStt = &rCpyPam; - typedef std::vector< const ::sw::mark::IMark* > mark_vector_t; - mark_vector_t vMarksToCopy; + std::vector< const ::sw::mark::IMark* > vMarksToCopy; for ( IDocumentMarkAccess::const_iterator_t ppMark = pSrcMarkAccess->getAllMarksBegin(); ppMark != pSrcMarkAccess->getAllMarksEnd(); ++ppMark ) diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index 619faef05aa4..b256c50658a1 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -58,11 +58,10 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; -typedef std::vector<SwAutoCompleteClient> SwAutoCompleteClientVector; - class SwAutoCompleteWord_Impl { - SwAutoCompleteClientVector m_aClientVector; + std::vector<SwAutoCompleteClient> + m_aClientVector; SwAutoCompleteWord& m_rAutoCompleteWord; public: explicit SwAutoCompleteWord_Impl(SwAutoCompleteWord& rParent) : @@ -71,14 +70,13 @@ public: void RemoveDocument(const SwDoc& rDoc); }; -typedef std::vector<const SwDoc*> SwDocPtrVector; class SwAutoCompleteString : public editeng::IAutoCompleteString { #if OSL_DEBUG_LEVEL > 0 static sal_uLong s_nSwAutoCompleteStringCount; #endif - SwDocPtrVector m_aSourceDocs; + std::vector<const SwDoc*> m_aSourceDocs; public: SwAutoCompleteString(const OUString& rStr, sal_Int32 nLen); diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 72ac17572ab4..21ff81b7b1d6 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -61,9 +61,6 @@ LocaleDataWrapper* SwSortElement::pLclData = nullptr; // List of all sorted elements -typedef std::multiset<SwSortTextElement> SwSortTextElements; -typedef std::multiset<SwSortBoxElement> SwSortBoxElements; - /// Construct a SortElement for the Sort void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt, FlatFndBox const * pFltBx ) @@ -372,7 +369,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) SwNodeIndex aStart(pStart->nNode); SwSortElement::Init( this, rOpt ); - SwSortTextElements aSortSet; + std::multiset<SwSortTextElement> aSortSet; while( aStart <= pEnd->nNode ) { // Iterate over a selected range @@ -551,7 +548,7 @@ bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // Sort SortList by Key SwSortElement::Init( this, rOpt, &aFlatBox ); - SwSortBoxElements aSortList; + std::multiset<SwSortBoxElement> aSortList; // When sorting, do not include the first row if the HeaderLine is repeated for( sal_uInt16 i = static_cast<sal_uInt16>(nStart); i < nCount; ++i) diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index c81eef636ff1..a87570131e27 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -75,8 +75,7 @@ class SwListImpl tListTreeForRange(std::unique_ptr<SwNodeNum> p1, std::unique_ptr<SwNodeNum> p2, std::unique_ptr<SwPaM> p3) : pRoot(std::move(p1)), pRootRLHidden(std::move(p2)), pSection(std::move(p3)) {} }; - typedef std::vector<tListTreeForRange> tListTrees; - tListTrees maListTrees; + std::vector<tListTreeForRange> maListTrees; int mnMarkedListLevel; diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 87168a5e1dc0..78948385c684 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -279,13 +279,12 @@ namespace sw class InsertedTablesManager { public: - typedef std::map<std::unique_ptr<InsertedTableListener>, SwNodeIndex*> TableMap; void DelAndMakeTableFrames(); void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM); explicit InsertedTablesManager(const SwDoc &rDoc); private: bool mbHasRoot; - TableMap maTables; + std::map<std::unique_ptr<InsertedTableListener>, SwNodeIndex*> maTables; }; class RedlineStack diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 1acde61e4c54..ce2b8803f12f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1067,7 +1067,6 @@ private: // Storage-Reader typedef std::set<WW8_CP> cp_set; -typedef std::vector<WW8_CP> cp_vector; class SwWW8ImplReader { @@ -1376,7 +1375,7 @@ private: bool m_bCareLastParaEndInToc; cp_set m_aTOXEndCps; - cp_vector m_aEndParaPos; + std::vector<WW8_CP> m_aEndParaPos; WW8_CP m_aCurrAttrCP; bool m_bOnLoadingMain:1; bool m_bNotifyMacroEventRead:1; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 750678477456..910f23ce2d3d 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -52,13 +52,12 @@ struct SwRedlineDataParent class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; -typedef std::vector<std::unique_ptr<SwRedlineDataChild>> SwRedlineDataChildArr; - class SW_DLLPUBLIC SwRedlineAcceptDlg final { std::shared_ptr<weld::Window> m_xParentDlg; std::vector<std::unique_ptr<SwRedlineDataParent>> m_RedlineParents; - SwRedlineDataChildArr m_RedlineChildren; + std::vector<std::unique_ptr<SwRedlineDataChild>> + m_RedlineChildren; SwRedlineDataParentSortArr m_aUsedSeqNo; Timer m_aSelectTimer; OUString m_sInserted; diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index 26407021ff52..cb1cd18cd114 100644 --- a/vcl/source/treelist/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -314,12 +314,9 @@ struct TDataCntnrEntry_Impl } -typedef ::std::vector< TDataCntnrEntry_Impl > TDataCntnrEntryList; - - struct TransferDataContainer_Impl { - TDataCntnrEntryList aFmtList; + std::vector< TDataCntnrEntry_Impl > aFmtList; Link<sal_Int8,void> aFinshedLnk; std::unique_ptr<INetBookmark> pBookmk; diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index 272825933beb..33b928d759f9 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -44,9 +44,7 @@ private: OString maBaseName; typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; - typedef std::vector< glyph_map_t > glyph_list_t; - - glyph_list_t maGlyphList; + std::vector< glyph_map_t > maGlyphList; OString GetGlyphSetName (sal_Int32 nGlyphSetID); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index e33a86a9a4a0..d03be9cba324 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -52,9 +52,6 @@ using namespace ::com::sun::star; namespace writerfilter::dmapper { -typedef ::std::map< OUString, OUString> StringPairMap_t; - - StyleSheetEntry::StyleSheetEntry() : sStyleIdentifierD() ,bIsDefaultStyle(false) @@ -1348,7 +1345,7 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten } // create a map only once - static const StringPairMap_t StyleNameMap{ + static const std::map< OUString, OUString> StyleNameMap { { "Normal", "Standard" }, { "heading 1", "Heading 1" }, { "heading 2", "Heading 2" }, |