diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 15:53:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-09 07:48:18 +0000 |
| commit | 389999abdb2d35f8641a6ff2e8984887166d39e2 (patch) | |
| tree | 746ae9503700b07bb84938c8899a24aeb8b8fcd8 /sfx2/source | |
| parent | 57998f642de65bdcb72742abd8ab94a26840a31d (diff) | |
make comphelper::containerToSequence a little smarter
So we don't have to specify the source and destination type as often.
Change-Id: Id9e286417a1cb246d163cbc3c536b231a4a92624
Reviewed-on: https://gerrit.libreoffice.org/30700
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/appdispatchprovider.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index c425d9d5150f..2f2a53d289c9 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -205,7 +205,7 @@ throw (uno::RuntimeException, std::exception) } } - return comphelper::containerToSequence< sal_Int16 >( aGroupList ); + return comphelper::containerToSequence( aGroupList ); } Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfigurableDispatchInformation( sal_Int16 nCmdGroup ) @@ -249,10 +249,7 @@ throw (uno::RuntimeException, std::exception) } } - uno::Sequence< frame::DispatchInformation > aSeq = - comphelper::containerToSequence< frame::DispatchInformation, std::list< frame::DispatchInformation > >( aCmdList ); - - return aSeq; + return comphelper::containerToSequence( aCmdList ); } } diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index dfe0fc664435..25f6e8001a5f 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -812,7 +812,7 @@ namespace sfx2 // create a representation of the group which is understandable by the XFilterGroupManager if ( _rGroup.size() ) { - Sequence< StringPair > aFilters( comphelper::containerToSequence<StringPair>(_rGroup) ); + Sequence< StringPair > aFilters( comphelper::containerToSequence(_rGroup) ); if ( _bAddExtension ) { StringPair* pFilters = aFilters.getArray(); diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 2c2ec74e29c3..c2cc85fe17c2 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1169,7 +1169,7 @@ throw (RuntimeException, std::exception) } } - return comphelper::containerToSequence< sal_Int16 >( aGroupList ); + return comphelper::containerToSequence( aGroupList ); } uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup ) @@ -1214,10 +1214,7 @@ throw (RuntimeException, std::exception) } } - uno::Sequence< frame::DispatchInformation > aSeq = - comphelper::containerToSequence< frame::DispatchInformation, std::list< frame::DispatchInformation > >( aCmdList ); - - return aSeq; + return comphelper::containerToSequence( aCmdList ); } bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent ) |