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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unotext2.cxx | 13 |
2 files changed, 10 insertions, 7 deletions
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" }); } |