diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-28 17:20:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 17:22:16 +0000 |
| commit | b193123b8e658d2eb25af5debe9de9e1b2386ef8 (patch) | |
| tree | be14e44cb0d0ce728c11893ad0e1c1c4bd44ff4f /chart2 | |
| parent | 4a0f0d714cc73c22dd2d363fd111d34f8413b387 (diff) | |
Integrate branch of IAccessible2
Change-Id: Ic7e0b943749266646722cf6525e77b006ae79232
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/accessibility/AccessibleBase.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index cc075f7ad95e..aa99cffe9c30 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 7132f4aaaf64..891ab40564d5 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( |