summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-11 14:54:18 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-11 14:54:18 +0000
commit49d2042f21ffaf619b1eb6eae64a92392acf9cf6 (patch)
tree1c5558f2f8d1c9d1a3e65705a179cf896072a21f
parenta92b0b4ff9eff6ac9a7f16ccb7e7c501a955a7ce (diff)
INTEGRATION: CWS vcl07 (1.8.6.5.4.2.40); FILE MERGED
2003/03/10 17:28:35 tbe 1.8.6.5.4.2.40.1: #107946# Accessibility: Menu items should return full path file names as accessible name
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 917d33551ee9..6d65b8bcadd8 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sfxpicklist.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: vg $ $Date: 2003-04-01 15:11:57 $
+ * last change: $Author: vg $ $Date: 2003-04-11 15:54:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -183,6 +183,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const St
INetURLObject aURL( aURLString );
rtl::OUString aTipHelpText;
+ rtl::OUString aAccessibleName( aPickEntry );
if ( aURL.GetProtocol() == INET_PROT_FILE )
{
@@ -196,6 +197,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const St
::rtl::OUString aCompactedSystemPath;
aTipHelpText = aSystemPath;
+ aAccessibleName += aSystemPath;
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
aPickEntry += String( aCompactedSystemPath );
@@ -215,11 +217,13 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const St
aShortURL = aURL.getAbbreviated( m_xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS );
aPickEntry += aShortURL;
aTipHelpText = aURLString;
+ aAccessibleName += aURLString;
}
- // Set menu item text and tip help
+ // Set menu item text, tip help and accessible name
pMenu->SetItemText( nItemId, aPickEntry );
pMenu->SetTipHelpText( nItemId, aTipHelpText );
+ pMenu->SetAccessibleName( nItemId, aAccessibleName );
}
void SfxPickList::RemovePickListEntries()