diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-09-25 12:26:58 -0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-25 21:13:17 +0000 |
| commit | 8b00ac9b4627d8d7ed13d352ccb8932be6861d97 (patch) | |
| tree | cac7420227f6a0b6d01e8c936263eeca083fdb4a /desktop | |
| parent | e678a8d8e5f1a178ab83da965b785d24b0a9cffb (diff) | |
tdf#94228 comphelper: replace BOOST_PP
Remove makeSequence.
Change-Id: If07dc8702d811111fc634c9c7eb4c9a331517ca5
Reviewed-on: https://gerrit.libreoffice.org/18647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
4 files changed, 3 insertions, 8 deletions
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx index e8b9ba7f5e4a..2a269e97edcf 100644 --- a/desktop/inc/pch/precompiled_deployment.hxx +++ b/desktop/inc/pch/precompiled_deployment.hxx @@ -106,7 +106,6 @@ #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include <com/sun/star/xml/xpath/XXPathAPI.hpp> #include <comphelper/anytostring.hxx> -#include <comphelper/makesequence.hxx> #include <comphelper/sequence.hxx> #include <comphelper/unwrapargs.hxx> #include <config_features.h> diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index f2fcae9cc3ab..e6fbc1b9560d 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx @@ -49,7 +49,6 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> #include <com/sun/star/xml/xpath/XPathAPI.hpp> -#include <comphelper/makesequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <comphelper/seqstream.hxx> diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 8ba5b0aeab9c..984e253e7d26 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -24,7 +24,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/seqstream.hxx> -#include <comphelper/makesequence.hxx> #include <comphelper/processfactory.hxx> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> @@ -469,7 +468,7 @@ css::uno::Sequence< OUString > DescriptionInfoset::getSupportedPlaforms() const //When there is no description.xml then we assume that we support all platforms if (! m_element.is()) { - return comphelper::makeSequence( OUString("all") ); + return { OUString("all") }; } //Check if the <platform> element was provided. If not the default is "all" platforms @@ -477,7 +476,7 @@ css::uno::Sequence< OUString > DescriptionInfoset::getSupportedPlaforms() const m_xpath->selectSingleNode(m_element, "desc:platform")); if (!nodePlatform.is()) { - return comphelper::makeSequence( OUString("all") ); + return { OUString("all") }; } //There is a platform element. diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index b97c458edf15..4f974ec102aa 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -35,7 +35,6 @@ #include <ucbhelper/content.hxx> #include <svl/inettype.hxx> #include <comphelper/anytostring.hxx> -#include <comphelper/makesequence.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -344,8 +343,7 @@ sal_Bool BackendImpl::supportsService(OUString const & ServiceName) Sequence<OUString> BackendImpl::getSupportedServiceNames() throw (RuntimeException, std::exception) { - return comphelper::makeSequence( - OUString(BACKEND_SERVICE_NAME) ); + return { OUString(BACKEND_SERVICE_NAME) }; } // XPackageRegistry |