diff options
24 files changed, 28 insertions, 53 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index f8d733c3e30b..def9d0f007ec 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -301,8 +301,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService( Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames() { - const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); - return Sequence< OUString >( &aServiceName, 1 ); + return { "com.sun.star.accessibility.AccessibleContext" }; } // other public methods diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index e7cd416217a8..8d7e42c0bff5 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -280,7 +280,7 @@ sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() { - return Sequence< OUString >{ + return { "com.sun.star.drawing.FillProperties", "com.sun.star.chart2.DataPoint", "com.sun.star.chart2.DataPointProperties", diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 1076e739a1c0..39d67725695b 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -646,7 +646,7 @@ OUString desktop::splash::getImplementationName() { css::uno::Sequence< OUString > desktop::splash::getSupportedServiceNames() { - return Sequence< OUString > { "com.sun.star.office.SplashScreen" }; + return { "com.sun.star.office.SplashScreen" }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index ac5f18382819..7851296c7fd7 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -288,9 +288,7 @@ sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames( ) { - OUString names[1]= {OUString(DNDSOURCE_SERVICE_NAME)}; - - return Sequence<OUString>(names, 1); + return { DNDSOURCE_SERVICE_NAME }; } /** This function is called as extra thread from diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index eed51da71ed4..c517079897d9 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -258,8 +258,7 @@ sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) { - OUString names[1]= {OUString(DNDTARGET_SERVICE_NAME)}; - return Sequence<OUString>(names, 1); + return { DNDTARGET_SERVICE_NAME }; } // XDropTarget diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index e73b92b3d6ba..6880aa2e695d 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -304,8 +304,7 @@ Sequence<OUString> SAL_CALL EventAttacherImpl::getSupportedServiceNames( ) Sequence<OUString> EventAttacherImpl::getSupportedServiceNames_Static( ) { - OUString aStr( SERVICENAME ); - return Sequence< OUString >( &aStr, 1 ); + return { SERVICENAME }; } void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments) diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index f210b848df6a..794a6561298f 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -165,8 +165,7 @@ namespace pcr Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) { - OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); - return Sequence< OUString >( &sService, 1 ); + return { "com.sun.star.inspection.ObjectInspectorModel" }; } diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 8e2fc213d089..db8d67eaa6c1 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -328,8 +328,7 @@ Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) Sequence<OUString> LangGuess_Impl::getSupportedServiceNames_Static( ) { - OUString aName( SERVICENAME ); - return Sequence< OUString >( &aName, 1 ); + return { SERVICENAME }; } /** diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx index 094920bf5802..58896ea41bf2 100644 --- a/lingucomponent/source/numbertext/numbertext.cxx +++ b/lingucomponent/source/numbertext/numbertext.cxx @@ -170,11 +170,7 @@ Sequence<OUString> SAL_CALL NumberText_Impl::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -Sequence<OUString> NumberText_Impl::getSupportedServiceNames_Static() -{ - OUString aName(SERVICENAME); - return Sequence<OUString>(&aName, 1); -} +Sequence<OUString> NumberText_Impl::getSupportedServiceNames_Static() { return { SERVICENAME }; } /** * Function to create a new component instance; is needed by factory helper implementation. diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index fe2d074c4632..57f66b1e0995 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -668,13 +668,10 @@ sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& service Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) { - OUString names[3]; - - names[0] = "com.sun.star.script.provider.MasterScriptProvider"; - names[1] = "com.sun.star.script.browse.BrowseNode"; - names[2] = "com.sun.star.script.provider.ScriptProvider"; - - return Sequence< OUString >( names, 3 ); + return { + "com.sun.star.script.provider.MasterScriptProvider", + "com.sun.star.script.browse.BrowseNode", + "com.sun.star.script.provider.ScriptProvider" }; } } // namespace func_provider diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e812c68af6b1..4b9bdd5b9e8b 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1231,8 +1231,7 @@ sal_Bool SAL_CALL SdStyleSheetPool::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL SdStyleSheetPool::getSupportedServiceNames() { - OUString aStr("com.sun.star.style.StyleFamilies"); - return Sequence< OUString >( &aStr, 1 ); + return { "com.sun.star.style.StyleFamilies" }; } // XNameAccess diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 15018b33ef58..a78b2ac32014 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -234,8 +234,7 @@ OUString PresenterProtocolHandler::getImplementationName_static() Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static() { - static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); - return Sequence<OUString>(&sServiceName, 1); + return { "com.sun.star.frame.ProtocolHandler" }; } Reference<XInterface> PresenterProtocolHandler::Create ( diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 9dfce2e83134..75408826ff42 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -731,7 +731,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::supportsService( Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames() { - return Sequence< OUString >{ + return { "css::accessibility::Accessible", "css::accessibility::AccessibleComponent", "css::accessibility::AccessibleContext", @@ -1774,7 +1774,7 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService( Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames() { - return Sequence< OUString >{ + return { "css::accessibility::Accessible", "css::accessibility::AccessibleComponent", "css::accessibility::AccessibleContext" diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 24e6f2df7bf5..0db1564f2a06 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -136,7 +136,7 @@ sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName /* XServiceInfo */ Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() { - return Sequence< OUString >{ "com.sun.star.frame.ExtendedTypeDetection" }; + return { "com.sun.star.frame.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index b41aedd7f575..80502f069b25 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -313,7 +313,7 @@ sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceN Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() { - return Sequence< OUString > { OUString("com.sun.star.accessibility.AccessibleContext") }; + return { "com.sun.star.accessibility.AccessibleContext" }; } //===== XTypeProvider ======================================================= diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index cc0c223c3f9d..cba13aef070d 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -660,8 +660,7 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) { - const OUString aSN( "com.sun.star.image.ImageMap" ); - return Sequence< OUString >( &aSN, 1 ); + return { "com.sun.star.image.ImageMap" }; } void SvUnoImageMap::fillImageMap( ImageMap& rMap ) const diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 8f7412437667..8207e31fc095 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1436,8 +1436,7 @@ sal_Bool UnoControl::supportsService( const OUString& rServiceName ) Sequence< OUString > UnoControl::getSupportedServiceNames( ) { - OUString sName( "com.sun.star.awt.UnoControl" ); - return Sequence< OUString >( &sName, 1 ); + return { "com.sun.star.awt.UnoControl" }; } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index fa27371cc914..cae4b6fee156 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1050,8 +1050,7 @@ sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) { - OUString sName( "com.sun.star.awt.UnoControlModel" ); - return Sequence< OUString >( &sName, 1 ); + return { "com.sun.star.awt.UnoControlModel" }; } sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx index fa9e8565f736..fe3407944f4b 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx @@ -89,8 +89,7 @@ sal_Bool SAL_CALL StarOfficeCalcImportFilter::supportsService(const OUString& rS Sequence<OUString> SAL_CALL StarOfficeCalcImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/draw/QXPImportFilter.cxx b/writerperfect/source/draw/QXPImportFilter.cxx index ae97223f2cda..4b74b73167dc 100644 --- a/writerperfect/source/draw/QXPImportFilter.cxx +++ b/writerperfect/source/draw/QXPImportFilter.cxx @@ -52,8 +52,7 @@ sal_Bool SAL_CALL QXPImportFilter::supportsService(const OUString& rServiceName) Sequence<OUString> SAL_CALL QXPImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx index 22886a2db8bc..2250bb54abc0 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx @@ -91,8 +91,7 @@ sal_Bool SAL_CALL StarOfficeDrawImportFilter::supportsService(const OUString& rS Sequence<OUString> SAL_CALL StarOfficeDrawImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx index 24552b012fb3..84914ecc2682 100644 --- a/writerperfect/source/draw/ZMFImportFilter.cxx +++ b/writerperfect/source/draw/ZMFImportFilter.cxx @@ -52,8 +52,7 @@ sal_Bool SAL_CALL ZMFImportFilter::supportsService(const OUString& rServiceName) Sequence<OUString> SAL_CALL ZMFImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx index b6f4c1f61394..81936eb0e75a 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx @@ -92,8 +92,7 @@ sal_Bool SAL_CALL StarOfficePresentationImportFilter::supportsService(const OUSt Sequence<OUString> SAL_CALL StarOfficePresentationImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx index 25a48687da2c..b2ad8f9dc1b0 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx @@ -117,8 +117,7 @@ sal_Bool SAL_CALL StarOfficeWriterImportFilter::supportsService(const OUString& Sequence<OUString> SAL_CALL StarOfficeWriterImportFilter::getSupportedServiceNames() { - return Sequence<OUString>{ "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExtendedTypeDetection" }; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* |