#103637# Service descriptions of controls in wrong place

2 files changed, 28 insertions, 20 deletions

diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 4f118af0f1cc..89e21704e141 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: vclxaccessiblecomponent.cxx,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: tbe $ $Date: 2002-11-06 15:17:54 $
+ *  last change: $Author: tbe $ $Date: 2002-11-20 16:56:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -185,7 +185,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedCom
 
 ::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleExtendedComponent" );
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleWindow" );
 }
 
 sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (uno::RuntimeException)
@@ -201,10 +201,8 @@ sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServi
 
 uno::Sequence< ::rtl::OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aNames(3);
-    aNames[0] = ::rtl::OUString::createFromAscii( "drafts.com.sun.star.accessibility.AccessibleContext" );
-    aNames[1] = ::rtl::OUString::createFromAscii( "drafts.com.sun.star.accessibility.AccessibleComponent" );
-    aNames[2] = ::rtl::OUString::createFromAscii( "drafts.com.sun.star.accessibility.AccessibleExtendedComponent" );
+    uno::Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "drafts.com.sun.star.awt.AccessibleWindow" );
     return aNames;
 }
 
diff --git a/toolkit/util/toolkit.xml b/toolkit/util/toolkit.xml
index 3cf34c078ac8..1f12afbe754f 100644
--- a/toolkit/util/toolkit.xml
+++ b/toolkit/util/toolkit.xml
@@ -426,12 +426,22 @@
 
     <component-description>
         <author>Thomas Benisch</author>
+        <name>com.sun.star.comp.toolkit.AccessibleWindow</name>
+        <description>specifies accessibility support for a window.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>drafts.com.sun.star.awt.AccessibleWindow</supported-service>
+    </component-description>
+
+    <component-description>
+        <author>Thomas Benisch</author>
         <name>com.sun.star.comp.toolkit.AccessibleButton</name>
         <description>specifies accessibility support for a button.</description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleButton</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleButton</supported-service>
     </component-description>
 
     <component-description>
@@ -441,7 +451,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleRadioButton</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleRadioButton</supported-service>
     </component-description>
 
     <component-description>
@@ -451,7 +461,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleCheckBox</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleCheckBox</supported-service>
     </component-description>
 
     <component-description>
@@ -461,7 +471,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleFixedText</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleFixedText</supported-service>
     </component-description>
 
     <component-description>
@@ -471,7 +481,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleEdit</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleEdit</supported-service>
     </component-description>
 
     <component-description>
@@ -481,7 +491,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleScrollBar</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleScrollBar</supported-service>
     </component-description>
 
     <component-description>
@@ -561,7 +571,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessiblePopupMenu</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessiblePopupMenu</supported-service>
     </component-description>
 
     <component-description>
@@ -571,7 +581,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleMenuBar</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleMenuBar</supported-service>
     </component-description>
 
     <component-description>
@@ -581,7 +591,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleMenu</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleMenu</supported-service>
     </component-description>
 
     <component-description>
@@ -591,7 +601,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleMenuItem</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleMenuItem</supported-service>
     </component-description>
 
     <component-description>
@@ -601,7 +611,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleMenuSeparator</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleMenuSeparator</supported-service>
     </component-description>
 
     <component-description>
@@ -611,7 +621,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleTabControl</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleTabControl</supported-service>
     </component-description>
 
     <component-description>
@@ -621,6 +631,6 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="beta"/>
-        <supported-service>drafts.com.sun.star.accessibility.AccessibleTabPage</supported-service>
+        <supported-service>drafts.com.sun.star.awt.AccessibleTabPage</supported-service>
     </component-description>
 </module-description>