diff options
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" }); } |