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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 245458c34aec..e6c764ebd224 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -452,7 +452,6 @@ #include <comphelper/extract.hxx> #include <comphelper/flagguard.hxx> #include <comphelper/genericpropertyset.hxx> -#include <comphelper/makesequence.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/unique_disposing_ptr.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 7761bdbddc13..61cddcc67ea7 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -60,7 +60,6 @@ #include <authfld.hxx> #include <SwXTextDefaults.hxx> #include <unochart.hxx> -#include <comphelper/makesequence.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <list> @@ -1142,7 +1141,7 @@ sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) th template<FlyCntType T> Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); + return { OUString("com.sun.star.container.XEnumeration") }; } OUString SwXFrames::getImplementationName() throw( RuntimeException, std::exception ) @@ -1157,7 +1156,7 @@ sal_Bool SwXFrames::supportsService(const OUString& rServiceName) throw( Runtime Sequence<OUString> SwXFrames::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - return ::comphelper::makeSequence(OUString("com.sun.star.text.TextFrames")); + return { OUString("com.sun.star.text.TextFrames") }; } SwXFrames::SwXFrames(SwDoc* _pDoc, FlyCntType eSet) : diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 251fa0a726ba..d407c0de08ad 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -57,7 +57,6 @@ #include <svx/shapepropertynotifier.hxx> #include <crstate.hxx> #include <comphelper/extract.hxx> -#include <comphelper/makesequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/scene3d.hxx> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> @@ -437,7 +436,7 @@ sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) thro uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { - return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); + return { OUString("com.sun.star.container.XEnumeration") }; } uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration() throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 9e661d665144..853942a17f0a 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -51,7 +51,6 @@ #include <statstr.hrc> #include <comphelper/documentconstants.hxx> -#include <comphelper/makesequence.hxx> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> using namespace ::com::sun::star; |