diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-06-20 22:40:45 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-23 13:13:14 +0200 |
| commit | 6441c2f2e20bc424c6a4cd1c2d704710e4d80346 (patch) | |
| tree | 83859a71b3f28a6305030e369c88a7f22b0918da /sfx2 | |
| parent | 849d5d9903e54c92682227dfad545664e4bbda53 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 0dc08812be6e..2cd55e1d3c21 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -141,8 +141,6 @@ namespace sfx2 typedef ::std::list< FilterClass > FilterClassList; typedef ::std::map< OUString, FilterClassList::iterator > FilterClassReferrer; - typedef ::std::vector< OUString > StringArray; - // = reading of configuration data @@ -219,7 +217,7 @@ namespace sfx2 }; - void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames ) + void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames ) { _rGlobalClasses.clear(); _rGlobalClassNames.clear(); @@ -306,7 +304,7 @@ namespace sfx2 } - void lcl_ReadClassification( FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames, FilterClassList& _rLocalClasses ) + void lcl_ReadClassification( FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames, FilterClassList& _rLocalClasses ) { // open our config node @@ -563,7 +561,7 @@ namespace sfx2 // read the classification of filters FilterClassList aGlobalClasses, aLocalClasses; - StringArray aGlobalClassNames; + std::vector<OUString> aGlobalClassNames; lcl_ReadClassification( aGlobalClasses, aGlobalClassNames, aLocalClasses ); @@ -624,7 +622,7 @@ namespace sfx2 "sfx2::lcl_GroupAndClassify: invalid all-filters array here!" ); // the loop below will work on invalid objects else ... ++aGroupPos; - StringArray::iterator aGlobalIter = aGlobalClassNames.begin(); + auto aGlobalIter = aGlobalClassNames.begin(); while ( ( aGroupPos != _rAllFilters.end() ) && ( aGlobalIter != aGlobalClassNames.end() ) && ( *aGlobalIter != aServiceName ) |