diff options
-rw-r--r-- | embeddedobj/source/commonembedding/xfactory.cxx | 5 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 5 | ||||
-rw-r--r-- | filter/source/storagefilterdetect/filterdetect.cxx | 6 | ||||
-rw-r--r-- | filter/source/t602/t602filter.cxx | 9 | ||||
-rw-r--r-- | filter/source/textfilterdetect/filterdetect.cxx | 6 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 6 |
6 files changed, 7 insertions, 30 deletions
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 50e926fd7867..1c0209460774 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -39,10 +39,7 @@ using namespace ::com::sun::star; uno::Sequence< OUString > OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< OUString > aRet(2); - aRet[0] = "com.sun.star.embed.OOoEmbeddedObjectFactory"; - aRet[1] = "com.sun.star.comp.embed.OOoEmbeddedObjectFactory"; - return aRet; + return { "com.sun.star.embed.OOoEmbeddedObjectFactory", "com.sun.star.comp.embed.OOoEmbeddedObjectFactory" }; } OUString OOoEmbeddedObjectFactory::impl_staticGetImplementationName() diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 29882d0d4029..8e0a4beb076e 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -208,10 +208,7 @@ OUString OdfFlatXml::impl_getImplementationName() Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames() { - Sequence< OUString > lServiceNames(2); - lServiceNames[0] = "com.sun.star.document.ImportFilter"; - lServiceNames[1] = "com.sun.star.document.ExportFilter"; - return lServiceNames; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExportFilter" }; } Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference< XMultiServiceFactory >& fact) diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx index 45bfa1f6cdbf..02ed875c6699 100644 --- a/filter/source/storagefilterdetect/filterdetect.cxx +++ b/filter/source/storagefilterdetect/filterdetect.cxx @@ -172,11 +172,7 @@ OUString StorageFilterDetect_getImplementationName() uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames() { - uno::Sequence<OUString> aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ExtendedTypeDetection"; - pArray[1] = "com.sun.star.comp.filters.StorageFilterDetect"; - return aRet; + return { "com.sun.star.document.ExtendedTypeDetection", "com.sun.star.comp.filters.StorageFilterDetect" }; } uno::Reference<uno::XInterface> StorageFilterDetect_createInstance( diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 1f8fe00c91e4..124ec86b0a0d 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -870,11 +870,7 @@ OUString T602ImportFilter_getImplementationName () Sequence< OUString > T602ImportFilter_getSupportedServiceNames( ) { - Sequence < OUString > aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ImportFilter"; - pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; - return aRet; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } Reference< XInterface > T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) @@ -1140,8 +1136,7 @@ OUString T602ImportFilterDialog_getImplementationName () Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( ) { - Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; - return aRet; + return { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; } Reference< XInterface > T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index 0551f275eecb..b4959639c574 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -219,11 +219,7 @@ OUString PlainTextFilterDetect_getImplementationName() uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames() { - uno::Sequence<OUString> aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ExtendedTypeDetection"; - pArray[1] = "com.sun.star.comp.filters.PlainTextFilterDetect"; - return aRet; + return { "com.sun.star.document.ExtendedTypeDetection", "com.sun.star.comp.filters.PlainTextFilterDetect" }; } // XServiceInfo diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 20ed64a4fb30..ba039bb99916 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -353,11 +353,7 @@ OUString XmlFilterAdaptor_getImplementationName () Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( ) { - Sequence < OUString > aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ExportFilter"; - pArray[1] = "com.sun.star.document.ImportFilter"; - return aRet; + return { "com.sun.star.document.ExportFilter", "com.sun.star.document.ImportFilter" }; } Reference< XInterface > XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr) |