[Libreoffice-commits] core.git: editeng/source include/comphelper sd/source svx/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 20 19:55:16 UTC 2019
editeng/source/uno/unotext.cxx | 4 +--
editeng/source/uno/unotext2.cxx | 13 +++++++-----
include/comphelper/OUStringLiteralList.hxx | 31 -----------------------------
sd/source/ui/unoidl/unopage.cxx | 9 +++++---
svx/source/unodraw/unoshap3.cxx | 27 ++++++++++++++-----------
5 files changed, 31 insertions(+), 53 deletions(-)
New commits:
commit f2c402e6747f23bb289d4ebd4c6ef8ff80067348
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 20 15:26:36 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 20 20:53:16 2019 +0100
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 at redhat.com>
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 3abed7b474a5..e0ffbfe82a20 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -45,13 +45,13 @@
#include <editeng/editeng.hxx>
#include <editeng/outliner.hxx>
#include <editeng/unoipset.hxx>
-#include <comphelper/OUStringLiteralList.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <editeng/unonames.hxx>
+#include <initializer_list>
#include <memory>
using namespace ::cppu;
@@ -2166,7 +2166,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames_Static(),
- comphelper::OUStringLiteralList({ "com.sun.star.text.Text" }));
+ std::initializer_list<OUStringLiteral>{ "com.sun.star.text.Text" });
}
namespace
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 1dbf6cfafc42..8addcc5fa2ab 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <initializer_list>
+
#include <vcl/svapp.hxx>
#include <rtl/instance.hxx>
@@ -24,7 +28,6 @@
#include <editeng/flditem.hxx>
#include <editeng/unofield.hxx>
#include <editeng/unotext.hxx>
-#include <comphelper/OUStringLiteralList.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -365,11 +368,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- comphelper::OUStringLiteralList({ "com.sun.star.style.ParagraphProperties",
+ std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
"com.sun.star.style.ParagraphPropertiesComplex",
"com.sun.star.style.ParagraphPropertiesAsian",
"com.sun.star.text.TextContent",
- "com.sun.star.text.Paragraph" }));
+ "com.sun.star.text.Paragraph" });
}
@@ -646,10 +649,10 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- comphelper::OUStringLiteralList({ "com.sun.star.style.ParagraphProperties",
+ std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
"com.sun.star.style.ParagraphPropertiesComplex",
"com.sun.star.style.ParagraphPropertiesAsian",
- "com.sun.star.text.TextCursor" }));
+ "com.sun.star.text.TextCursor" });
}
diff --git a/include/comphelper/OUStringLiteralList.hxx b/include/comphelper/OUStringLiteralList.hxx
deleted file mode 100644
index 8c149671ffdf..000000000000
--- a/include/comphelper/OUStringLiteralList.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_COMPHELPER_OUSTRINGLITERALLIST_HXX
-#define INCLUDED_COMPHELPER_OUSTRINGLITERALLIST_HXX
-
-#include <sal/config.h>
-
-#include <initializer_list>
-#include <rtl/ustring.hxx>
-
-namespace comphelper
-{
-// Constructs std::initializer_list<OUStringLiteral> without explicit functional cast
-// to avoid [loplugin:redundantfcast] warnings
-inline const std::initializer_list<OUStringLiteral>&
-OUStringLiteralList(const std::initializer_list<OUStringLiteral>& list)
-{
- return list;
-}
-}
-
-#endif // INCLUDED_COMPHELPER_OUSTRINGLITERALLIST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 55340b4b91d5..328e50f0aba0 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.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/awt/XBitmap.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -47,7 +51,6 @@
#include <svx/unoshape.hxx>
#include <svl/style.hxx>
#include <comphelper/extract.hxx>
-#include <comphelper/OUStringLiteralList.hxx>
#include <comphelper/sequence.hxx>
#include <svx/svditer.hxx>
#include <vcl/wmf.hxx>
@@ -1489,9 +1492,9 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxFmDrawPage::getSupportedServiceNames(),
- comphelper::OUStringLiteralList({ "com.sun.star.drawing.GenericDrawPage",
+ std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.GenericDrawPage",
"com.sun.star.document.LinkTarget",
- "com.sun.star.document.LinkTargetSupplier" }));
+ "com.sun.star.document.LinkTargetSupplier" });
}
// XLinkTargetSupplier
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: */
More information about the Libreoffice-commits
mailing list