diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-20 15:26:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-20 20:53:16 +0100 |
| commit | f2c402e6747f23bb289d4ebd4c6ef8ff80067348 (patch) | |
| tree | 6fb93fe436931dc32d7d6c63fae01996de360eec /svx | |
| parent | df24a0dc144c8f963f8567c17b2d1a1090558cdb (diff) | |
Remove comphelper::OUStringLiteralList
...that had been introduced with 51eb969cb77f8b54681033f4959b15ce32116b56
"Replace comphelper::ServiceInfoHelper::addToSequence" and obsoleted by
<https://gerrit.libreoffice.org/#/c/83291/> "loplugin:redundantfcast: Don't warn
about cast from braced-init-list"
Change-Id: Ic5bb63cf4f528285587f46437a27bafbb05a07ac
Reviewed-on: https://gerrit.libreoffice.org/83315
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 5aacef9bc2c7..10ab55650102 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <initializer_list> + #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/Direction3D.hpp> @@ -24,7 +28,6 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> -#include <comphelper/OUStringLiteralList.hxx> #include <comphelper/sequence.hxx> #include <sal/log.hxx> @@ -409,7 +412,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3DScene" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3DScene" }); } Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj) @@ -529,8 +532,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DCube" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", + "com.sun.star.drawing.Shape3DCube" }); } Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj) @@ -634,8 +637,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DSphere" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", + "com.sun.star.drawing.Shape3DSphere" }); } Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj) @@ -814,8 +817,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DLathe" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", + "com.sun.star.drawing.Shape3DLathe" }); } Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj) @@ -897,8 +900,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DExtrude" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", + "com.sun.star.drawing.Shape3DExtrude" }); } Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj) @@ -1033,8 +1036,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames( { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - comphelper::OUStringLiteralList({ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DPolygon" })); + std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", + "com.sun.star.drawing.Shape3DPolygon" }); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |