summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-10-04 19:20:18 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-10-05 18:51:32 -0500
commit189b48e8d9dee6c23977251c346f5d8d041a5781 (patch)
treed6febb91fd92983ce47ad2df28ffd3ef545231c0
parentf03609138701fe799e5e1118eefe8adb5440caaf (diff)
accfixes2: some role string stuff in chart2, nad using role SHAPE now
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx9
2 files changed, 4 insertions, 7 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index da0ffe71eca7..17fa0780b63c 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -636,7 +636,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 d18fe55d2951..126b4141ed48 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -74,10 +74,7 @@ const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" ));
String lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
{
- String aEntry( rRole );
- aEntry += '\t';
- aEntry += String(
- ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+ String aEntry( ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
aEntry += '\t';
aEntry += String( rRange );
@@ -145,8 +142,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(