summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-05-28 11:44:42 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-05-28 11:44:42 +0000
commit4b437861a8a3235c468deb390bdfd2c2e6a43c00 (patch)
tree2ba035d801802541bdc9454705e5910d673ee8a1 /vcl
parent5ad50900f488629e35fa67a62af8fa5a81209725 (diff)
INTEGRATION: CWS sw013 (1.170.14); FILE MERGED
2003/05/07 10:05:41 tl 1.170.14.1: #109101# accessible name for image and push buttons fixed
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/window.cxx16
1 files changed, 14 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1e951c5e6d15..161c18ae946b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: window.cxx,v $
*
- * $Revision: 1.172 $
+ * $Revision: 1.173 $
*
- * last change: $Author: vg $ $Date: 2003-05-28 12:32:58 $
+ * last change: $Author: vg $ $Date: 2003-05-28 12:44:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -8448,6 +8448,18 @@ String Window::GetAccessibleName() const
aAccessibleName = GetText();
}
break;
+
+ case WINDOW_IMAGEBUTTON:
+ case WINDOW_PUSHBUTTON:
+ aAccessibleName = GetText();
+ if ( !aAccessibleName.Len() )
+ {
+ aAccessibleName = GetQuickHelpText();
+ if ( !aAccessibleName.Len() )
+ aAccessibleName = GetHelpText();
+ }
+ break;
+
default:
aAccessibleName = GetText();
break;