strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify a bit

Browse source 
Change-Id: Ie2b96e099a0507e14ad8e79276abdbe0f21d35f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178040
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2024-12-07 18:04:42 +05:00
parent b96894426f
commit a35f0aee62
5 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editeng/source/uno/unotext.cxx
View file

@ -2219,7 +2219,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames_Static(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.text.Text" });
std::initializer_list<OUString>{ u"com.sun.star.text.Text"_ustr });
}
const uno::Sequence< sal_Int8 > & SvxUnoTextBase::getUnoTunnelId() noexcept

18
editeng/source/uno/unotext2.cxx
View file

@ -357,11 +357,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.style.ParagraphProperties",
u"com.sun.star.style.ParagraphPropertiesComplex",
u"com.sun.star.style.ParagraphPropertiesAsian",
u"com.sun.star.text.TextContent",
u"com.sun.star.text.Paragraph" });
std::initializer_list<OUString>{ u"com.sun.star.style.ParagraphProperties"_ustr,
u"com.sun.star.style.ParagraphPropertiesComplex"_ustr,
u"com.sun.star.style.ParagraphPropertiesAsian"_ustr,
u"com.sun.star.text.TextContent"_ustr,
u"com.sun.star.text.Paragraph"_ustr });
}
@ -618,10 +618,10 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.style.ParagraphProperties",
u"com.sun.star.style.ParagraphPropertiesComplex",
u"com.sun.star.style.ParagraphPropertiesAsian",
u"com.sun.star.text.TextCursor" });
std::initializer_list<OUString>{ u"com.sun.star.style.ParagraphProperties"_ustr,
u"com.sun.star.style.ParagraphPropertiesComplex"_ustr,
u"com.sun.star.style.ParagraphPropertiesAsian"_ustr,
u"com.sun.star.text.TextCursor"_ustr });
}

4
forms/source/component/Grid.cxx
View file

@ -231,11 +231,9 @@ void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::
Sequence< Type > SAL_CALL OGridControlModel::getTypes( )
{
return concatSequences(
concatSequences(
OControlModel::getTypes(),
OInterfaceContainer::getTypes(),
OErrorBroadcaster::getTypes()
),
OErrorBroadcaster::getTypes(),
OGridControlModel_BASE::getTypes()
);
}

22
svx/source/unodraw/unoshap3.cxx
View file

@ -420,7 +420,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3DScene" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3DScene"_ustr });
}
Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj)
@ -540,8 +540,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DCube" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3D"_ustr,
u"com.sun.star.drawing.Shape3DCube"_ustr });
}
Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj)
@ -645,8 +645,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DSphere" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3D"_ustr,
u"com.sun.star.drawing.Shape3DSphere"_ustr });
}
Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj)
@ -825,8 +825,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DLathe" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3D"_ustr,
u"com.sun.star.drawing.Shape3DLathe"_ustr });
}
Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj)
@ -908,8 +908,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DExtrude" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3D"_ustr,
u"com.sun.star.drawing.Shape3DExtrude"_ustr });
}
Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj)
@ -1044,8 +1044,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames(
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DPolygon" });
std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape3D"_ustr,
u"com.sun.star.drawing.Shape3DPolygon"_ustr });
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
sw/source/core/unocore/unodraw.cxx
View file

@ -2212,7 +2212,7 @@ uno::Sequence< OUString > SwXShape::getSupportedServiceNames()
if (SvxShape* pSvxShape = GetSvxShape())
aSeq = pSvxShape->getSupportedServiceNames();
return comphelper::concatSequences(
aSeq, std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape" });
aSeq, std::initializer_list<OUString>{ u"com.sun.star.drawing.Shape"_ustr });
}
SvxShape* SwXShape::GetSvxShape()