From 6441c2f2e20bc424c6a4cd1c2d704710e4d80346 Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Wed, 20 Jun 2018 22:40:45 +0300 Subject: tdf#96099 Remove trivial std::vector typedefs in sd, sfx2, shell Change-Id: Ib3708c9650f273de4a2f549d2ce9f2465bd37d6c Reviewed-on: https://gerrit.libreoffice.org/56206 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/ui/animations/SlideTransitionPane.cxx | 6 ++-- sd/source/ui/inc/SlideTransitionPane.hxx | 3 +- sd/source/ui/sidebar/MasterPageObserver.cxx | 17 ++++----- sd/source/ui/view/ToolBarManager.cxx | 48 +++++++++++-------------- 4 files changed, 30 insertions(+), 44 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index cd51f1cf36a9..fe555039409e 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -662,7 +662,7 @@ void SlideTransitionPane::updateControls() } else if( aEffect.mbSoundOn && !aEffect.maSound.isEmpty() ) { - tSoundListType::size_type nPos = 0; + std::vector::size_type nPos = 0; if( lcl_findSoundInList( maSoundList, aEffect.maSound, nPos )) { mpLB_SOUND->SelectEntryPos( nPos + 3 ); @@ -747,7 +747,7 @@ void SlideTransitionPane::openSoundFileDialog() aFileDialog.Execute() == ERRCODE_NONE ) { OUString aFile = aFileDialog.GetPath(); - tSoundListType::size_type nPos = 0; + std::vector::size_type nPos = 0; bValidSoundFile = lcl_findSoundInList( maSoundList, aFile, nPos ); if( bValidSoundFile ) @@ -789,7 +789,7 @@ void SlideTransitionPane::openSoundFileDialog() { if( !maCurrentSoundFile.isEmpty() ) { - tSoundListType::size_type nPos = 0; + std::vector::size_type nPos = 0; if( lcl_findSoundInList( maSoundList, maCurrentSoundFile, nPos )) mpLB_SOUND->SelectEntryPos( nPos + 3 ); else diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 106e50da4980..f3cdb048ba18 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -136,8 +136,7 @@ private: bool mbIsMainViewChangePending; bool mbHorizontalLayout; - typedef ::std::vector< OUString > tSoundListType; - tSoundListType maSoundList; + std::vector maSoundList; mutable OUString maCurrentSoundFile; // How many variants each transition set has diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index c6fa9dc227fb..341c02cb090d 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -266,25 +266,20 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( aCurrentMasterPages.insert (pMasterPage->GetName()); } - typedef ::std::vector StringList; - StringList aNewMasterPages; - StringList aRemovedMasterPages; + std::vector aNewMasterPages; + std::vector aRemovedMasterPages; MasterPageContainer::iterator aOldMasterPagesDescriptor ( maUsedMasterPages.find(&rDocument)); if (aOldMasterPagesDescriptor != maUsedMasterPages.end()) { - StringList::iterator I; - - ::std::set::iterator J; - // Send events about the newly used master pages. ::std::set_difference ( aCurrentMasterPages.begin(), aCurrentMasterPages.end(), aOldMasterPagesDescriptor->second.begin(), aOldMasterPagesDescriptor->second.end(), - ::std::back_insert_iterator(aNewMasterPages)); - for (I=aNewMasterPages.begin(); I!=aNewMasterPages.end(); ++I) + std::back_inserter(aNewMasterPages)); + for (auto I=aNewMasterPages.begin(); I!=aNewMasterPages.end(); ++I) { MasterPageObserverEvent aEvent ( MasterPageObserverEvent::ET_MASTER_PAGE_ADDED, @@ -298,8 +293,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( aOldMasterPagesDescriptor->second.end(), aCurrentMasterPages.begin(), aCurrentMasterPages.end(), - ::std::back_insert_iterator(aRemovedMasterPages)); - for (I=aRemovedMasterPages.begin(); I!=aRemovedMasterPages.end(); ++I) + std::back_inserter(aRemovedMasterPages)); + for (auto I=aRemovedMasterPages.begin(); I!=aRemovedMasterPages.end(); ++I) { MasterPageObserverEvent aEvent ( MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED, diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 91db27743b2a..6b0c77231b15 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -68,8 +68,6 @@ private: Reference mxLayouter; }; -typedef ::std::vector NameList; - /** Store a list of tool bars for each of the tool bar groups. From this the list of requested tool bars is built. */ @@ -82,19 +80,19 @@ public: void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); - void GetToolBarsToActivate (NameList& rToolBars) const; - void GetToolBarsToDeactivate (NameList& rToolBars) const; + void GetToolBarsToActivate (std::vector& rToolBars) const; + void GetToolBarsToDeactivate (std::vector& rToolBars) const; void MarkToolBarAsActive (const OUString& rsName); void MarkToolBarAsNotActive (const OUString& rsName); void MarkAllToolBarsAsNotActive(); private: - typedef ::std::map Groups; + typedef ::std::map > Groups; Groups maGroups; - NameList maActiveToolBars; + std::vector maActiveToolBars; - void MakeRequestedToolBarList (NameList& rToolBars) const; + void MakeRequestedToolBarList (std::vector& rToolBars) const; }; /** Manage tool bars that are implemented as sub shells of a view shell. @@ -682,12 +680,11 @@ void ToolBarManager::Implementation::PreUpdate() // Get the list of tool bars that are not used anymore and are to be // deactivated. - NameList aToolBars; + std::vector aToolBars; maToolBarList.GetToolBarsToDeactivate(aToolBars); // Turn off the tool bars. - NameList::const_iterator iToolBar; - for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) + for (auto iToolBar=aToolBars.cbegin(); iToolBar!=aToolBars.cend(); ++iToolBar) { OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " << sFullName); @@ -710,14 +707,13 @@ void ToolBarManager::Implementation::PostUpdate() mbPostUpdatePending = false; // Create the list of requested tool bars. - NameList aToolBars; + std::vector aToolBars; maToolBarList.GetToolBarsToActivate(aToolBars); SAL_INFO("sd.view", OSL_THIS_FUNC << ": ToolBarManager::PostUpdate ["); // Turn on the tool bars that are visible in the new context. - NameList::const_iterator iToolBar; - for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) + for (auto iToolBar=aToolBars.cbegin(); iToolBar!=aToolBars.cend(); ++iToolBar) { OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " << sFullName); @@ -1220,13 +1216,12 @@ void ToolBarList::AddToolBar ( { Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup == maGroups.end()) - iGroup = maGroups.emplace(eGroup,NameList()).first; + iGroup = maGroups.emplace(eGroup,std::vector()).first; if (iGroup != maGroups.end()) { - NameList::const_iterator iBar ( - ::std::find(iGroup->second.begin(),iGroup->second.end(),rsName)); - if (iBar == iGroup->second.end()) + auto iBar (std::find(iGroup->second.cbegin(),iGroup->second.cend(),rsName)); + if (iBar == iGroup->second.cend()) { iGroup->second.push_back(rsName); } @@ -1240,8 +1235,7 @@ bool ToolBarList::RemoveToolBar ( Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup != maGroups.end()) { - NameList::iterator iBar ( - ::std::find(iGroup->second.begin(),iGroup->second.end(),rsName)); + auto iBar (std::find(iGroup->second.begin(),iGroup->second.end(),rsName)); if (iBar != iGroup->second.end()) { iGroup->second.erase(iBar); @@ -1251,7 +1245,7 @@ bool ToolBarList::RemoveToolBar ( return false; } -void ToolBarList::MakeRequestedToolBarList (NameList& rRequestedToolBars) const +void ToolBarList::MakeRequestedToolBarList (std::vector& rRequestedToolBars) const { for (auto eGroup : o3tl::enumrange()) { @@ -1264,13 +1258,12 @@ void ToolBarList::MakeRequestedToolBarList (NameList& rRequestedToolBars) const } } -void ToolBarList::GetToolBarsToActivate (NameList& rToolBars) const +void ToolBarList::GetToolBarsToActivate (std::vector& rToolBars) const { - NameList aRequestedToolBars; + std::vector aRequestedToolBars; MakeRequestedToolBarList(aRequestedToolBars); - NameList::const_iterator iToolBar; - for (iToolBar=aRequestedToolBars.begin(); iToolBar!=aRequestedToolBars.end(); ++iToolBar) + for (auto iToolBar=aRequestedToolBars.cbegin(); iToolBar!=aRequestedToolBars.cend(); ++iToolBar) { if (::std::find(maActiveToolBars.begin(),maActiveToolBars.end(),*iToolBar) == maActiveToolBars.end()) @@ -1280,13 +1273,12 @@ void ToolBarList::GetToolBarsToActivate (NameList& rToolBars) const } } -void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const +void ToolBarList::GetToolBarsToDeactivate (std::vector& rToolBars) const { - NameList aRequestedToolBars; + std::vector aRequestedToolBars; MakeRequestedToolBarList(aRequestedToolBars); - NameList::const_iterator iToolBar; - for (iToolBar=maActiveToolBars.begin(); iToolBar!=maActiveToolBars.end(); ++iToolBar) + for (auto iToolBar=maActiveToolBars.cbegin(); iToolBar!=maActiveToolBars.cend(); ++iToolBar) { if (::std::find(aRequestedToolBars.begin(),aRequestedToolBars.end(),*iToolBar) == aRequestedToolBars.end()) -- cgit