From f1018190a8f791b7dca195f223b9c987a73a83af Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Tue, 13 Sep 2016 13:48:00 +0200 Subject: tdf#88205 use list ctor for uno::Sequence a11y to canvas Change-Id: Ib719c94c0488b8a48fdb013bc8fbd1a988595d18 Reviewed-on: https://gerrit.libreoffice.org/28866 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- accessibility/source/extended/accessibleiconchoicectrl.cxx | 8 +++----- .../source/extended/accessibleiconchoicectrlentry.cxx | 8 +++----- accessibility/source/extended/accessiblelistbox.cxx | 8 +++----- accessibility/source/extended/accessiblelistboxentry.cxx | 8 +++----- accessibility/source/standard/vclxaccessiblelistitem.cxx | 8 +++----- accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 ++++------ 6 files changed, 19 insertions(+), 31 deletions(-) (limited to 'accessibility') diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index aa9d9abc5754..7b4708c0ad57 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -146,11 +146,9 @@ namespace accessibility Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static() throw (RuntimeException) { - Sequence< OUString > aSupported(3); - aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; - aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; - aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControl"; - return aSupported; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.awt.AccessibleIconChoiceControl"}; } OUString AccessibleIconChoiceCtrl::getImplementationName_Static() throw (RuntimeException) diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 119e603b4c7b..d60fe598557d 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -249,11 +249,9 @@ throw(RuntimeException, std::exception) Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static() throw( RuntimeException ) { - Sequence< OUString > aSupported(3); - aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; - aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; - aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControlEntry"; - return aSupported; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.awt.AccessibleIconChoiceControlEntry"}; } OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static() throw( RuntimeException ) diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 30bd2c76c822..4436500b83f5 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -337,11 +337,9 @@ namespace accessibility Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static() throw( RuntimeException ) { - Sequence< OUString > aSupported(3); - aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; - aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; - aSupported[2] = "com.sun.star.awt.AccessibleTreeListBox"; - return aSupported; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.awt.AccessibleTreeListBox"}; } OUString AccessibleListBox::getImplementationName_Static() throw( RuntimeException ) diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index a087d6f625bd..cd70de11a83d 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -274,11 +274,9 @@ namespace accessibility Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static() throw( RuntimeException ) { - Sequence< OUString > aSupported(3); - aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; - aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; - aSupported[2] = "com.sun.star.awt.AccessibleTreeListBoxEntry"; - return aSupported; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.awt.AccessibleTreeListBoxEntry"}; } OUString AccessibleListBoxEntry::getImplementationName_Static() throw( RuntimeException ) diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 52724e647b1b..c21cee4a1951 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -198,11 +198,9 @@ sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { - Sequence< OUString > aNames(3); - aNames[0] = "com.sun.star.accessibility.AccessibleContext"; - aNames[1] = "com.sun.star.accessibility.AccessibleComponent"; - aNames[2] = "com.sun.star.accessibility.AccessibleListItem"; - return aNames; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.accessibility.AccessibleListItem"}; } // XAccessible diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index f772b7f11789..9d189001e403 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -305,12 +305,10 @@ sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceNam Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { - Sequence< OUString > aNames(4); - aNames[0] = "com.sun.star.accessibility.AccessibleContext"; - aNames[1] = "com.sun.star.accessibility.AccessibleComponent"; - aNames[2] = "com.sun.star.accessibility.AccessibleExtendedComponent"; - aNames[3] = "com.sun.star.accessibility.AccessibleToolBoxItem"; - return aNames; + return {"com.sun.star.accessibility.AccessibleContext", + "com.sun.star.accessibility.AccessibleComponent", + "com.sun.star.accessibility.AccessibleExtendedComponent", + "com.sun.star.accessibility.AccessibleToolBoxItem"}; } // XAccessible -- cgit