diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-03 13:30:17 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-03 13:30:44 +0200 |
commit | 5edd744d1021b41f59528a6e3a8adebfe63e6b6e (patch) | |
tree | c94e4879df8d505ba3f670e3c5aa2640080e8f7a | |
parent | a381d16d23d0efb678e9e410db3ad23313693640 (diff) |
sw: inline use-once typedefs
Change-Id: Id0e54c92769e6c82690fe6f1eab488fcabe6c655
42 files changed, 85 insertions, 149 deletions
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 73e431b271db..3871b6b09fa1 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -38,20 +38,18 @@ struct SW_DLLPUBLIC SwSortKey bool bIsNumeric; }; -typedef std::vector<SwSortKey*> SwSortKeys; - struct SW_DLLPUBLIC SwSortOptions { SwSortOptions(); ~SwSortOptions(); SwSortOptions(const SwSortOptions& rOpt); - SwSortKeys aKeys; - SwSortDirection eDirection; - sal_Unicode cDeli; - sal_uInt16 nLanguage; - bool bTable; - bool bIgnoreCase; + std::vector<SwSortKey*> aKeys; + SwSortDirection eDirection; + sal_Unicode cDeli; + sal_uInt16 nLanguage; + bool bTable; + bool bIgnoreCase; }; #endif // INCLUDED_SW_INC_SORTOPT_HXX diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 612ea7ce8ac7..8306b83f5616 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -87,8 +87,6 @@ class SwPrintData; class SwRenderData; class SwViewShell; -typedef std::deque<UnoActionContext*> ActionContextArr; - typedef cppu::WeakImplHelper < css::text::XTextDocument, @@ -136,7 +134,7 @@ private: class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; - ActionContextArr aActionArr; + std::deque<UnoActionContext*> aActionArr; const SfxItemPropertySet* pPropSet; diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx index e35b58718a70..cefee2819065 100644 --- a/sw/source/core/access/acchypertextdata.hxx +++ b/sw/source/core/access/acchypertextdata.hxx @@ -28,16 +28,14 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::std::less< const SwTextAttr * > SwTextAttrPtrLess; - class SwAccessibleHyperTextData { public: - typedef const SwTextAttr * key_type; + typedef const SwTextAttr * key_type; typedef ::com::sun::star::uno::WeakReference< com::sun::star::accessibility::XAccessibleHyperlink > mapped_type; typedef std::pair<const key_type,mapped_type> value_type; - typedef SwTextAttrPtrLess key_compare; + typedef ::std::less< const SwTextAttr * > key_compare; typedef std::map<key_type,mapped_type,key_compare>::iterator iterator; private: std::map<key_type,mapped_type,key_compare> maMap; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 5bbf0db11f43..c7eefefc987a 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -500,9 +500,7 @@ public: } }; -typedef ::std::list < SwAccessibleEvent_Impl > _SwAccessibleEventList_Impl; - -class SwAccessibleEventList_Impl: public _SwAccessibleEventList_Impl +class SwAccessibleEventList_Impl: public ::std::list < SwAccessibleEvent_Impl > { bool mbFiring; @@ -562,9 +560,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd() // shape) leads to an assert, because a client of the Modify is destroyed // within a Modify call. -typedef ::std::list < uno::Reference < drawing::XShape > > _SwShapeList_Impl; - -class SwShapeList_Impl: public _SwShapeList_Impl +class SwShapeList_Impl: public ::std::list < uno::Reference < drawing::XShape > > { public: SwShapeList_Impl() {} diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 5a9458271d63..35fca786f314 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -58,11 +58,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::sw::access; -typedef ::std::less < sal_Int32 > Int32Less_Impl; -typedef ::std::set < sal_Int32, Int32Less_Impl > Int32Set_Impl; - +typedef ::std::set < sal_Int32 > Int32Set_Impl; typedef ::std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl; -typedef ::std::list < Int32Pair_Impl > Int32PairList_Impl; const unsigned int SELECTION_WITH_NUM = 10; @@ -80,7 +77,7 @@ class SwAccessibleTableData_Impl SwAccessibleMap& mrAccMap; Int32Set_Impl maRows; Int32Set_Impl maColumns; - Int32PairList_Impl maExtents; // cell extends for event processing only + ::std::list < Int32Pair_Impl > maExtents; // cell extends for event processing only Point maTabFrmPos; const SwTabFrm *mpTabFrm; bool mbIsInPagePreview; diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 4d938a90e4ca..c4986f5b28b0 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -75,8 +75,6 @@ using namespace ::com::sun::star; #define CHECK_TABLE(t) #endif -typedef std::map<SwTableLine*, sal_uInt16> SwTableLineWidthMap_t; - // In order to set the Frame Formats for the Boxes, it's enough to look // up the current one in the array. If it's already there return the new one. struct _CpyTabFrm @@ -101,7 +99,7 @@ struct _CpyTabFrm struct CR_SetBoxWidth { SwSelBoxes m_Boxes; - SwTableLineWidthMap_t m_LineWidthMap; + std::map<SwTableLine*, sal_uInt16> m_LineWidthMap; SwShareBoxFormats aShareFormats; SwTableNode* pTableNd; SwUndoTableNdsChg* pUndo; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index d0cc2072bd77..f9bc95e21fdf 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -941,8 +941,6 @@ public: OUString GetName() { return aName; } }; -typedef boost::ptr_vector<_RefIdsMap> _RefIdsMaps; - /// Get a sorted list of the field IDs from a document. /// @param[in] rDoc The document to search. /// @param[in,out] rIds The list of IDs found in the document. @@ -1096,7 +1094,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) // then there are RefFields in the DescDox - so all RefFields in the SourceDoc // need to be converted to have unique IDs for both documents _RefIdsMap aFntMap( aEmptyOUStr ); - _RefIdsMaps aFieldMap; + boost::ptr_vector<_RefIdsMap> aFieldMap; SwIterator<SwFormatField,SwFieldType> aIter( *this ); for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() ) diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index e9570d58b612..4d1699998043 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -95,8 +95,6 @@ struct _Sort_CellFrm : pFrm( &rCFrm ) {} }; -typedef std::deque< _Sort_CellFrm > _Sort_CellFrms; - static const SwLayoutFrm *lcl_FindCellFrm( const SwLayoutFrm *pLay ) { while ( pLay && !pLay->IsCellFrm() ) @@ -484,7 +482,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) break; } - _Sort_CellFrms aCellFrms; + std::deque< _Sort_CellFrm > aCellFrms; // Skip any repeated headlines in the follow: const SwLayoutFrm* pRow = pTable->IsFollow() ? diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 56bb95d69fcf..426b862ac3e1 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -54,16 +54,16 @@ struct SwSortUndoElement ~SwSortUndoElement(); }; -typedef boost::ptr_vector<SwSortUndoElement> SwSortList; typedef std::vector<SwNodeIndex*> SwUndoSortList; class SwUndoSort : public SwUndo, private SwUndRng { - SwSortOptions* pSortOpt; - SwSortList aSortList; + SwSortOptions* pSortOpt; + boost::ptr_vector<SwSortUndoElement> + aSortList; SwUndoAttrTable* pUndoTableAttr; - SwRedlineData* pRedlData; - sal_uLong nTableNd; + SwRedlineData* pRedlData; + sal_uLong nTableNd; public: SwUndoSort( const SwPaM&, const SwSortOptions& ); diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index d1a853c91dc1..e6e3492b6423 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -42,11 +42,9 @@ public: { return aRect == rSwURLNote.aRect; } }; -typedef boost::ptr_vector<SwURLNote> SwURLNoteList; - class SwNoteURL { - SwURLNoteList aList; + boost::ptr_vector<SwURLNote> aList; public: SwNoteURL() {} void InsertURLNote( const OUString& rURL, const OUString& rTarget, diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 619229fea4ff..1fd7a0816b5b 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -54,8 +54,6 @@ struct SwTOXSource } }; -typedef std::vector<SwTOXSource> SwTOXSources; - struct TextAndReading { OUString sText; @@ -120,7 +118,7 @@ public: */ struct SwTOXSortTabBase { - SwTOXSources aTOXSources; + std::vector<SwTOXSource> aTOXSources; ::com::sun::star::lang::Locale aLocale; const SwTextNode* pTOXNd; const SwTextTOXMark* pTextMark; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 679a3d3b1a90..e4482e878c1b 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2490,11 +2490,7 @@ struct lt_SwLineEntry }; typedef std::set< SwLineEntry, lt_SwLineEntry > SwLineEntrySet; -typedef std::set< SwLineEntry, lt_SwLineEntry >::iterator SwLineEntrySetIter; -typedef std::set< SwLineEntry, lt_SwLineEntry >::const_iterator SwLineEntrySetConstIter; typedef std::map< SwTwips, SwLineEntrySet > SwLineEntryMap; -typedef std::map< SwTwips, SwLineEntrySet >::iterator SwLineEntryMapIter; -typedef std::map< SwTwips, SwLineEntrySet >::const_iterator SwLineEntryMapConstIter; class SwTabFrmPainter { @@ -2560,7 +2556,7 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev ); - SwLineEntryMapConstIter aIter = maHoriLines.begin(); + SwLineEntryMap::const_iterator aIter = maHoriLines.begin(); bool bHori = true; // color for subsidiary lines: @@ -2595,7 +2591,7 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const break; const SwLineEntrySet& rEntrySet = (*aIter).second; - for (SwLineEntrySetConstIter aSetIter = rEntrySet.begin(); + for (SwLineEntrySet::const_iterator aSetIter = rEntrySet.begin(); aSetIter != rEntrySet.end(); ++aSetIter) { const SwLineEntry& rEntry = *aSetIter; @@ -2801,10 +2797,10 @@ void SwTabFrmPainter::FindStylesForLine( const Point& rStartPoint, // pStyles[ 5 ] = bHori ? aRFromR : BFromB, // pStyles[ 6 ] = bHori ? aRFromB : BFromR, - SwLineEntryMapConstIter aMapIter = maVertLines.find( rStartPoint.X() ); + SwLineEntryMap::const_iterator aMapIter = maVertLines.find( rStartPoint.X() ); OSL_ENSURE( aMapIter != maVertLines.end(), "FindStylesForLine: Error" ); const SwLineEntrySet& rVertSet = (*aMapIter).second; - SwLineEntrySetConstIter aIter = rVertSet.begin(); + SwLineEntrySet::const_iterator aIter = rVertSet.begin(); while ( aIter != rVertSet.end() ) { @@ -3022,7 +3018,7 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori ) // get all lines from structure, that have key entry of pLE SwLineEntryMap* pLine2 = bHori ? &maHoriLines : &maVertLines; const SwTwips nKey = rNew.mnKey; - SwLineEntryMapIter aMapIter = pLine2->find( nKey ); + SwLineEntryMap::iterator aMapIter = pLine2->find( nKey ); SwLineEntrySet* pLineSet = aMapIter != pLine2->end() ? &((*aMapIter).second) : 0; if ( !pLineSet ) @@ -3031,7 +3027,7 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori ) (*pLine2)[ nKey ] = aNewSet; pLineSet = &(*pLine2)[ nKey ]; } - SwLineEntrySetIter aIter = pLineSet->begin(); + SwLineEntrySet::iterator aIter = pLineSet->begin(); while ( aIter != pLineSet->end() && rNew.mnStartPos < rNew.mnEndPos ) { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 507a6ce80509..29d432878a86 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -814,8 +814,6 @@ SwFieldType* SwXFieldMaster::GetFieldType(bool const bDontCreate) const return static_cast<SwFieldType*>(m_pImpl->GetRegisteredIn()); } -typedef std::vector<SwFormatField*> SwDependentFields; - uno::Any SAL_CALL SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, @@ -840,7 +838,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, else if(rPropertyName == UNO_NAME_DEPENDENT_TEXT_FIELDS) { //fill all text fields into a sequence - SwDependentFields aFieldArr; + std::vector<SwFormatField*> aFieldArr; SwIterator<SwFormatField,SwFieldType> aIter( *pType ); SwFormatField* pField = aIter.First(); while(pField) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 1f7c49ea1d33..73eb990bd338 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -332,7 +332,6 @@ class SwCSS1Parser; class SwHTMLNumRuleInfo; typedef boost::ptr_vector<ImageMap> ImageMaps; -typedef std::vector<SwFrameFormat *> SwHTMLFrameFormats; #define HTML_CNTXT_PROTECT_STACK 0x0001 #define HTML_CNTXT_STRIP_PARA 0x0002 @@ -381,7 +380,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute _HTMLAttrTable aAttrTab; // "offene" Attribute _HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext - SwHTMLFrameFormats aMoveFlyFrms;// Fly-Frames, the anchor is moved + std::vector<SwFrameFormat *> aMoveFlyFrms;// Fly-Frames, the anchor is moved std::deque<sal_Int32> aMoveFlyCnts;// and the Content-Positions SwApplet_Impl *pAppletImpl; // das aktuelle Applet diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 8dad0b5294c6..df11e3eb00d1 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -209,8 +209,6 @@ public: ~HTMLControls() { DeleteAndDestroyAll(); } }; -typedef std::vector<SwFormatINetFormat*> INetFormats; - struct SwHTMLFormatInfo { const SwFormat *pFormat; // das Format selbst @@ -308,7 +306,7 @@ public: HTMLControls aHTMLControls; // die zu schreibenden Forms SwHTMLFormatInfos m_CharFormatInfos; SwHTMLFormatInfos m_TextCollInfos; - INetFormats aINetFormats; // die "offenen" INet-Attribute + std::vector<SwFormatINetFormat*> aINetFormats; // die "offenen" INet-Attribute SwHTMLTextFootnotes *pFootEndNotes; OUString aCSS1Selector; // der Selektor eines Styles diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 1b3ff701b744..78d835381c9a 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -50,8 +50,6 @@ template<class C> class StyleMapperImpl; class SwTextFormatColl; class SwCharFormat; -typedef myImplHelpers::StyleMapperImpl<SwTextFormatColl> ParaMapper; -typedef myImplHelpers::StyleMapperImpl<SwCharFormat> CharMapper; namespace sw { @@ -182,7 +180,7 @@ namespace sw { private: //I hate these things stupid pImpl things, but its warranted here - ParaMapper *mpImpl; + ::myImplHelpers::StyleMapperImpl<SwTextFormatColl> *mpImpl; public: explicit ParaStyleMapper(SwDoc &rDoc); ~ParaStyleMapper(); @@ -242,7 +240,7 @@ namespace sw { private: //I hate these things stupid pImpl things, but its warranted here - CharMapper *mpImpl; + ::myImplHelpers::StyleMapperImpl<SwCharFormat> *mpImpl; public: explicit CharStyleMapper(SwDoc &rDoc); ~CharStyleMapper(); diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 5cfc82c94f62..29fde60af4b1 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -157,7 +157,6 @@ public: }; typedef ::std::multiset<CellInfo, ::std::less<CellInfo> > CellInfoMultiSet; -typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr; typedef ::std::map<sal_uInt32, WW8TableNodeInfoInner*, ::std::greater<sal_uInt32> > RowEndInners_t; @@ -233,7 +232,7 @@ struct hashTable class WW8TableCellGridRow { - CellInfoMultiSetPtr m_pCellInfos; + boost::shared_ptr<CellInfoMultiSet> m_pCellInfos; TableBoxVectorPtr m_pTableBoxVector; WidthsPtr m_pWidths; RowSpansPtr m_pRowSpans; diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 752179ae99fb..2103b6556935 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -27,8 +27,6 @@ class RtfAttributeOutput; class RtfExportFilter; class RtfSdrExport; typedef std::map<sal_uInt16,Color> RtfColorTable; -typedef std::map<sal_uInt16,OString> RtfStyleTable; -typedef std::map<OUString,sal_uInt16> RtfRedlineTable; class SwNode; class SwTextNode; class SwGrfNode; @@ -208,8 +206,8 @@ private: void WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg = false); RtfColorTable m_aColTable; - RtfStyleTable m_aStyTable; - RtfRedlineTable m_aRedlineTable; + std::map<sal_uInt16, OString> m_aStyTable; + std::map<OUString, sal_uInt16> m_aRedlineTable; /// If set, then Strm() returns this tream, instead of m_pWriter's stream. std::unique_ptr<SvMemoryStream> m_pStream; }; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 1fe29a663787..06c96dea7700 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -698,8 +698,8 @@ bool SwWW8AttrIter::IsDropCap( int nSwPos ) bool SwWW8AttrIter::RequiresImplicitBookmark() { - SwImplBookmarksIter bkmkIterEnd = m_rExport.m_aImplicitBookmarks.end(); - for ( SwImplBookmarksIter aIter = m_rExport.m_aImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter ) + std::vector<aBookmarkPair>::iterator bkmkIterEnd = m_rExport.m_aImplicitBookmarks.end(); + for ( std::vector<aBookmarkPair>::iterator aIter = m_rExport.m_aImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter ) { sal_uLong sample = aIter->second; @@ -915,8 +915,8 @@ bool AttributeOutputBase::AnalyzeURL( const OUString& rUrl, const OUString& /*rT if ( sRefType == "outline" ) { OUString sLink = sMark.copy(0, nPos); - SwImplBookmarksIter bkmkIterEnd = GetExport().m_aImplicitBookmarks.end(); - for ( SwImplBookmarksIter aIter = GetExport().m_aImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter ) + std::vector<aBookmarkPair>::iterator bkmkIterEnd = GetExport().m_aImplicitBookmarks.end(); + for ( std::vector<aBookmarkPair>::iterator aIter = GetExport().m_aImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter ) { if ( aIter->first == sLink ) { diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4d1d370228b5..c758c1771318 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -175,7 +175,6 @@ public: }; typedef std::map<OUString,long> BKMKNames; -typedef BKMKNames::iterator BKMKNmItr; typedef std::pair<bool,OUString> BKMK; typedef std::pair<long,BKMK> BKMKCP; typedef std::multimap<long,BKMKCP*> BKMKCPs; @@ -216,7 +215,7 @@ WW8_WrtBookmarks::~WW8_WrtBookmarks() void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm, const ::sw::mark::IMark*) { - std::pair<BKMKNmItr,bool> aResult = maSwBkmkNms.insert(std::pair<OUString,long>(rNm,0L)); + std::pair<BKMKNames::iterator, bool> aResult = maSwBkmkNms.insert(std::pair<OUString,long>(rNm,0L)); if (aResult.second) { BKMK aBK(false,rNm); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index f81136d715f6..ed343f6edf80 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -403,8 +403,6 @@ private: }; typedef ::std::pair<OUString, sal_uLong> aBookmarkPair; -typedef std::vector<aBookmarkPair> SwImplBookmarks; -typedef std::vector<aBookmarkPair>::iterator SwImplBookmarksIter; class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor { @@ -478,7 +476,7 @@ public: public: /* implicit bookmark vector containing pairs of node indexes and bookmark names */ - SwImplBookmarks m_aImplicitBookmarks; + std::vector<aBookmarkPair> m_aImplicitBookmarks; sw::Frames m_aFrames; // The floating frames in this document const SwPageDesc *m_pAktPageDesc; bool m_bPrevTextNodeIsEmpty; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 8fcd9d5b26f1..67b5f6bf9483 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -284,17 +284,14 @@ inline void SwXMLTableCell_Impl::Dispose() xSubTable = 0; } -typedef boost::ptr_vector<SwXMLTableCell_Impl> SwXMLTableCells_Impl; - class SwXMLTableRow_Impl { - OUString aStyleName; - OUString aDfltCellStyleName; - OUString mXmlId; - - SwXMLTableCells_Impl aCells; - - bool bSplitable; + OUString aStyleName; + OUString aDfltCellStyleName; + OUString mXmlId; + boost::ptr_vector<SwXMLTableCell_Impl> + aCells; + bool bSplitable; public: diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 635127f989b5..89bfda428365 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -135,7 +135,6 @@ struct AutoMarkEntry bCase(false), bWord(false){} }; -typedef boost::ptr_vector<AutoMarkEntry> AutoMarkEntryArr; typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base; @@ -154,7 +153,7 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base OUString sYes; OUString sNo; - AutoMarkEntryArr aEntryArr; + boost::ptr_vector<AutoMarkEntry> aEntryArr; ::svt::CellControllerRef xController; ::svt::CellControllerRef xCheckController; diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 73c4acad139e..a8c16150e4b9 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -46,8 +46,8 @@ public: }; // Bookmarks use case-insensitive name lookup in MS Word. -typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE; -class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE +class BookmarkCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess, + container::XIndexAccess > { private: uno::Reference< container::XNameAccess > mxNameAccess; diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index fb672767973a..9aedd85fb486 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -26,8 +26,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base; - class CellsEnumWrapper : public EnumerationHelper_BASE { uno::Reference< container::XIndexAccess > mxIndexAccess; @@ -52,7 +50,8 @@ public: } }; -class CellCollectionHelper : public CellCollectionHelper_Base +class CellCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index bb053e05dc2c..f30c724f6c96 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -638,8 +638,7 @@ typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; -typedef ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE; -class DocPropEnumeration : public DocPropEnumeration_BASE +class DocPropEnumeration : public ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > { DocProps mDocProps; DocProps::iterator mIt; diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 777e0b281b38..4e3e07805482 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -227,10 +227,7 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare return uno::makeAny( xField ); } -typedef ::cppu::WeakImplHelper< css::container::XEnumeration > FieldEnumeration_BASE; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE; - -class FieldEnumeration : public FieldEnumeration_BASE +class FieldEnumeration : public ::cppu::WeakImplHelper< css::container::XEnumeration > { uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; @@ -252,7 +249,8 @@ public: } }; -class FieldCollectionHelper : public FieldCollectionHelper_BASE +class FieldCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 6a63ac359310..494e78782b53 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -27,8 +27,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper< container::XEnumeration > FramesEnumeration_Base; -class FramesEnumeration : public FramesEnumeration_Base +class FramesEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 3e0d153f5fcb..97d860b96b6f 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -25,8 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; // I assume there is only one headersfooters in Writer -typedef ::cppu::WeakImplHelper<container::XIndexAccess > HeadersFootersIndexAccess_Base; -class HeadersFootersIndexAccess : public HeadersFootersIndexAccess_Base +class HeadersFootersIndexAccess : public ::cppu::WeakImplHelper<container::XIndexAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 22f1632afcc7..c79b09da247e 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -24,8 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; // I assume there is only one pane in Writer -typedef ::cppu::WeakImplHelper<container::XIndexAccess > PanesIndexAccess_Base; -class PanesIndexAccess : public PanesIndexAccess_Base +class PanesIndexAccess : public ::cppu::WeakImplHelper<container::XIndexAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 280120058071..eeef8b630e3a 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -73,9 +73,8 @@ SwVbaParagraph::getServiceNames() return aServiceNames; } -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE; - -class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE +class ParagraphCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< text::XTextDocument > mxTextDocument; diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 04b46a419a49..9a4213809c48 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -25,11 +25,9 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper< container::XEnumeration > RevisionEnumeration_BASE; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE; typedef std::vector< uno::Reference< beans::XPropertySet > > RevisionMap; -class RedlinesEnumeration : public RevisionEnumeration_BASE +class RedlinesEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { RevisionMap mRevisionMap; RevisionMap::iterator mIt; @@ -48,7 +46,8 @@ public: } }; -class RevisionCollectionHelper : public RevisionCollectionHelper_BASE +class RevisionCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { RevisionMap mRevisionMap; public: diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 4669a51c2f02..a23d56d63c81 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -28,11 +28,9 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper< container::XEnumeration > SectionEnumeration_BASE; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base; typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec; -class SectionEnumeration : public SectionEnumeration_BASE +class SectionEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { XSectionVec mxSections; XSectionVec::iterator mIt; @@ -53,7 +51,8 @@ public: }; // here I regard pagestyle as section -class SectionCollectionHelper : public SectionCollectionHelper_Base +class SectionCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 4ff11568549b..21194a26d667 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -157,9 +157,9 @@ static const MSOStyleNameTable aMSOStyleNameTable[] = { 0, 0, 0 } }; -typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE; - -class StyleCollectionHelper : public StyleCollectionHelper_BASE +class StyleCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess, + container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< frame::XModel > mxModel; diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 1ccfa74702b6..8bb0bc7bbdb6 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -59,11 +59,10 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab return false; } -typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumBase; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base; typedef std::vector< uno::Reference< text::XTextTable > > XTextTableVec; -class TableCollectionHelper : public TableCollectionHelper_Base +class TableCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XNameAccess > { XTextTableVec mxTables; XTextTableVec::iterator cachePos; @@ -132,7 +131,7 @@ public: } }; -class TableEnumerationImpl : public EnumBase +class TableEnumerationImpl : public ::cppu::WeakImplHelper< css::container::XEnumeration > { uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 5bf40d7cbb4e..cfb68febf6ab 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -25,7 +25,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base; typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec; class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE @@ -52,7 +51,8 @@ public: } }; -class TableOfContentsCollectionHelper : public TableOfContentsCollectionHelper_Base +class TableOfContentsCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index abc8543cd723..3c1f1737c837 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -38,8 +38,6 @@ static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaP xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) ); } -typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base; - class TabStopsEnumWrapper : public EnumerationHelper_BASE { uno::Reference< container::XIndexAccess > mxIndexAccess; @@ -64,7 +62,8 @@ public: } }; -class TabStopCollectionHelper : public TabStopCollectionHelper_Base +class TabStopCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess, + container::XEnumerationAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index a370117a9c18..9f44305e1175 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -70,7 +70,6 @@ struct TextBlockInfo_Impl OUString sLongName; OUString sGroupName; }; -typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr; // Dialog for edit templates void SwGlossaryHdl::GlossaryDlg() @@ -393,7 +392,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, SwGlossaries *pGlossaries, SwTextBlocks *pGlossary ) { - TextBlockInfoArr aFoundArr; + boost::ptr_vector<TextBlockInfo_Impl> aFoundArr; OUString aShortName( rShortName ); bool bCancel = false; // search for text block diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index 729b917f4c70..c5ae2bff1c08 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -43,11 +43,9 @@ struct AutoTextGroup } }; -typedef std::vector<AutoTextGroup*> AutoTextGroups; - class SwGlossaryList : public AutoTimer { - AutoTextGroups aGroupArr; + std::vector<AutoTextGroup*> aGroupArr; OUString sPath; bool bFilled; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 40c33d07dad9..a4d8581b68bb 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -55,18 +55,15 @@ struct SwRedlineDataParent { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; -typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr; - class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {}; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; -typedef std::vector<SvTreeListEntry*> SvLBoxEntryArr; - class SW_DLLPUBLIC SwRedlineAcceptDlg { VclPtr<vcl::Window> pParentDlg; - SwRedlineDataParentArr aRedlineParents; + boost::ptr_vector<SwRedlineDataParent> + aRedlineParents; SwRedlineDataChildArr aRedlineChildren; SwRedlineDataParentSortArr aUsedSeqNo; VclPtr<SvxAcceptChgCtr> aTabPagesCTRL; diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 65823dd0231e..b6205c0dcbbd 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -31,8 +31,6 @@ namespace sw { class StoredChapterNumberingRules; } #define MAX_NUM_RULES 9 -typedef boost::ptr_vector<SfxPoolItem> _SwNumFormatsAttrs; - class SW_DLLPUBLIC SwNumRulesWithName { OUString maName; @@ -44,7 +42,7 @@ class SW_DLLPUBLIC SwNumRulesWithName SwNumFormat aFormat; OUString sCharFormatName; sal_uInt16 nCharPoolId; - _SwNumFormatsAttrs aItems; + boost::ptr_vector<SfxPoolItem> aItems; _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION; diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index dd2f23f46ae3..8c17d0b0c186 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -647,7 +647,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); sal_uInt16 nCount = pSh->GetRedlineCount(); - SvLBoxEntryArr aLBoxArr; + std::vector<SvTreeListEntry*> aLBoxArr; // because of Bug of TLB that ALWAYS calls the SelectHandler at Remove: pTable->SetSelectHdl(aOldSelectHdl); |