[Libreoffice-commits] core.git: chart2/source

[Steve Yin]

 chart2/source/controller/accessibility/AccessibleBase.cxx |    2 +-
 chart2/source/controller/dialogs/tp_DataSource.cxx        |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit b193123b8e658d2eb25af5debe9de9e1b2386ef8
Author: Steve Yin <steve_y at apache.org>
Date:   Thu Nov 28 17:20:23 2013 +0000

    Integrate branch of IAccessible2
    
    Change-Id: Ic7e0b943749266646722cf6525e77b006ae79232

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index cc075f7..aa99cff 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -604,7 +604,7 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
 sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
     throw (RuntimeException)
 {
-    return AccessibleRole::LIST_ITEM; // #i73747# role SHAPE seems more appropriate, but is not read
+    return AccessibleRole::SHAPE;
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 7132f4a..891ab40 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -58,12 +58,9 @@ const OUString lcl_aLabelRole( "label" );
 OUString lcl_GetRoleLBEntry(
     const OUString & rRole, const OUString & rRange )
 {
-    OUStringBuffer aEntry( rRole );
+    OUStringBuffer aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI(rRole));
     aEntry.append( "\t" );
-    aEntry.append( OUString(
-        ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )) );
-    aEntry.append( "\t" );
-    aEntry.append(OUString( rRange ));
+    aEntry.append(rRange);
 
     return aEntry.makeStringAndClear();
 }
@@ -129,8 +126,8 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry )
 }
 
 static long lcl_pRoleListBoxTabs[] =
-    {   3,        // Number of Tabs
-        0, 0, 75
+    {   2,        // Number of Tabs
+        0, 75
     };
 
 void lcl_ShowChooserButton(