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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index b98cc0ee95ea..4b471f177715 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -332,10 +332,7 @@ ExtensionManager::getExtensionsWithSameIdentifier( "Could not find extension: " + identifier + ", " + fileName, static_cast<cppu::OWeakObject*>(this), -1); - return comphelper::containerToSequence< - Reference<css::deployment::XPackage>, - ::std::list<Reference<css::deployment::XPackage> > - > (listExtensions); + return comphelper::containerToSequence(listExtensions); } catch ( const css::deployment::DeploymentException & ) { @@ -369,10 +366,7 @@ bool ExtensionManager::isUserDisabled( } OSL_ASSERT(listExtensions.size() == 3); - return isUserDisabled( ::comphelper::containerToSequence< - Reference<css::deployment::XPackage>, - ::std::list<Reference<css::deployment::XPackage> > - > (listExtensions)); + return isUserDisabled( ::comphelper::containerToSequence(listExtensions) ); } bool ExtensionManager::isUserDisabled( @@ -425,10 +419,7 @@ void ExtensionManager::activateExtension( OSL_ASSERT(listExtensions.size() == 3); activateExtension( - ::comphelper::containerToSequence< - Reference<css::deployment::XPackage>, - ::std::list<Reference<css::deployment::XPackage> > - > (listExtensions), + ::comphelper::containerToSequence(listExtensions), bUserDisabled, bStartup, xAbortChannel, xCmdEnv); fireModified(); |