*api: clean up multi-line and mal-formed XML tags

It is amazing what some people believe autodoc supports.

Also, com::sun::star::uno::Any does not exist in IDL, that is part of
the C++ language binding.

Change-Id: I1f1f5cf5d27663ace6ff618ecbecb41fd2dfa1fc

36 files changed, 552 insertions, 756 deletions

diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index fbd16902aa75..d4022e85b2e1 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -39,9 +39,8 @@ service AccessibleButton
     /** This interface gives access to the structural information of a button:
 
         <ul>
-        <li>Role: The role of a button is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PUSH_BUTTON</const>.</li>
+        <li>Role: The role of a button is
+            com::sun::star::accessibility::AccessibleRole::PUSH_BUTTON.</li>
         <li>Name: The name of a button is its localized label.</li>
         <li>Description: The description of a button is its localized
             help text.</li>
@@ -50,31 +49,25 @@ service AccessibleButton
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::PRESSED</const> is set
-                if the object is currently pressed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::PRESSED
+                is set if the object is currently pressed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -102,8 +95,7 @@ service AccessibleButton
 
     /** This interface gives access to the numerical value of a button,
         which is related to the button's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::PRESSED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::PRESSED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 0fa11ca02243..9ef4d9e9fff3 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -40,9 +40,8 @@ service AccessibleCheckBox
         check box:
 
         <ul>
-        <li>Role: The role of a check box is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::CHECK_BOX</const>.</li>
+        <li>Role: The role of a check box is
+            com::sun::star::accessibility::AccessibleRole::CHECK_BOX.</li>
         <li>Name: The name of a check box is its localized label.</li>
         <li>Description: The description of a check box is its localized
             help text.</li>
@@ -51,28 +50,23 @@ service AccessibleCheckBox
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 196aefde2c78..aa350b59cc17 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -44,9 +44,8 @@ service AccessibleComboBox
     /** This interface gives access to the structural information of a combo box:
 
        <ul>
-       <li>Role: The role of a combo box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a combo box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a combo box is its localized label.</li>
        <li>Description: The description of a combo box is its localized
            help text.</li>
@@ -57,31 +56,25 @@ service AccessibleComboBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 259ebcbe35bf..5e3aea6df310 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -48,9 +48,8 @@ service AccessibleDropDownComboBox
     /** This interface gives access to the structural information of a dropdown combo box:
 
        <ul>
-       <li>Role: The role of a dropdown combo box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a dropdown combo box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a dropdown combo box is its localized label.</li>
        <li>Description: The description of a dropdown combo box is its localized
            help text.</li>
@@ -61,31 +60,25 @@ service AccessibleDropDownComboBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 49a1d97b94db..62a649186da3 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -49,9 +49,8 @@ service AccessibleDropDownListBox
     /** This interface gives access to the structural information of a dropdown list box:
 
        <ul>
-       <li>Role: The role of a dropdown list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::COMBO_BOX</const>.</li>
+       <li>Role: The role of a dropdown list box is
+           com::sun::star::accessibility::AccessibleRole::COMBO_BOX.</li>
        <li>Name: The name of a dropdown list box is its localized label.</li>
        <li>Description: The description of a dropdown list box is its localized
            help text.</li>
@@ -61,31 +60,25 @@ service AccessibleDropDownListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 73ff968e7026..3c4cce690467 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -38,16 +38,14 @@ service AccessibleEdit
     /** This interface gives access to the structural information of an edit:
 
         <ul>
-        <li>Role: The role of an edit is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::TEXT</const>.
+        <li>Role: The role of an edit is
+            com::sun::star::accessibility::AccessibleRole::TEXT.
             If the text content of the edit is password protected
-            the role is <const scope="com::sun::star::accessibility"
-            >AccessibleRole::PASSWORD_TEXT</const>.</li>
-        <li>Name: If the relation of type <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRelationType::LABELED_BY</const> is set,
-            the name of the edit is the localized label of the target
+            the role is
+            com::sun::star::accessibility::AccessibleRole::PASSWORD_TEXT.</li>
+        <li>Name: If the relation of type
+            com::sun::star::accessibility::AccessibleRelationType::LABELED_BY
+            is set, the name of the edit is the localized label of the target
             object, otherwise there is no name.</li>
         <li>Description: The description of an edit is its localized
             help text.</li>
@@ -55,36 +53,31 @@ service AccessibleEdit
         <li>Parent: The parent is the window that contains the edit.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::LABELED_BY</const> is set
-                if the object is labeled by one or more target
+            <li>com::sun::star::accessibility::AccessibleRelationType::LABELED_BY
+                is set if the object is labeled by one or more target
                 objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::EDITABLE</const> is set
+            <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE
+                is set
                 if the content of the object can be changed by the user.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index 70975422af61..bf50561bcac9 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -38,9 +38,8 @@ service AccessibleFixedText
         fixed text:
 
         <ul>
-        <li>Role: The role of a fixed text is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::LABEL</const>.</li>
+        <li>Role: The role of a fixed text is
+        com::sun::star::accessibility::AccessibleRole::LABEL.</li>
         <li>Name: The name of a fixed text is its localized label.</li>
         <li>Description: The description of a fixed text is its localized
             help text.</li>
@@ -48,31 +47,26 @@ service AccessibleFixedText
         <li>Parent: The parent is the window that contains the fixed text.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::LABEL_FOR</const> is set
-                if the object is a label for one or more target
+            <li>com::sun::star::accessibility::AccessibleRelationType::LABEL_FOR
+                is set if the object is a label for one or more target
                 objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MULTI_LINE</const> is set
-                if the object contains multiple lines of text.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::MULTI_LINE
+                is set if the object contains multiple lines of text.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 3998188856b2..9d9325753290 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -44,9 +44,8 @@ service AccessibleIconChoiceControl
     /** This interface gives access to the structural information of an icon choice control:
 
        <ul>
-       <li>Role: The role of an icon choice control is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TREE</const>.</li>
+       <li>Role: The role of an icon choice control is
+       com::sun::star::accessibility::AccessibleRole::TREE.</li>
        <li>Name: The name of an icon choice control is IconChoiceControl.</li>
        <li>Description: The description of an icon choice control is its localized
            help text.</li>
@@ -56,35 +55,29 @@ service AccessibleIconChoiceControl
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set. Children are transient.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
+           <li><com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MANAGES_DESCENDANTS
+               is always set. Children are transient.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index 73d776ebefd7..aa20ed1704b7 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -46,9 +46,8 @@ service AccessibleIconChoiceControlEntry
     /** This interface gives access to the structural information of an icon choice control entry:
 
        <ul>
-       <li>Role: The role of an icon choice control entry is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LABEL</const>.</li>
+       <li>Role: The role of an icon choice control entry is
+       com::sun::star::accessibility::AccessibleRole::LABEL.</li>
        <li>Name: The name of an icon choice control entry is it's text.</li>
        <li>Description: The description of an icon choice control entry is empty.</li>
        <li>Children: There exist no children.
@@ -57,26 +56,23 @@ service AccessibleIconChoiceControlEntry
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::TRANSIENT</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set when it is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when it is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 039410446295..6e896a07d888 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -51,9 +51,8 @@ service AccessibleList
     /** This interface gives access to the structural information of a list:
 
        <ul>
-       <li>Role: The role of a list is <const
-           scope="::com::sun::star::accessibility"
-           >AccessibleRole::LIST</const>.</li>
+       <li>Role: The role of a list is
+           ::com::sun::star::accessibility::AccessibleRole::LIST.</li>
        <li>Name: The name of a list is its localized label.</li>
        <li>Description: The description of a list is its localized
            help text.</li>
@@ -72,36 +71,29 @@ service AccessibleList
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set
-               if the list supports multi selection.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set.
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set if the list supports multi selection.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MANAGES_DESCENDANTS
+               is always set.
                The children are transient.</li>
            </ul>
            </li>
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 5d2b866481c7..388af78b8bac 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -45,9 +45,8 @@ service AccessibleListBox
     /** This interface gives access to the structural information of a list box:
 
        <ul>
-       <li>Role: The role of a list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::PANEL</const>.</li>
+       <li>Role: The role of a list box is
+       com::sun::star::accessibility::AccessibleRole::PANEL.</li>
        <li>Name: The name of a list box is its localized label.</li>
        <li>Description: The description of a list box is its localized
            help text.</li>
@@ -57,31 +56,25 @@ service AccessibleListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index f2ebd145f487..f4aa65a5c6ea 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -45,9 +45,8 @@ service AccessibleListItem
     /** This interface gives access to the structural information of a list item:
 
        <ul>
-       <li>Role: The role of a list item is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LIST_ITEM</const>.</li>
+       <li>Role: The role of a list item is
+       com::sun::star::accessibility::AccessibleRole::LIST_ITEM.</li>
        <li>Name: The name of a list item is the text of the item.</li>
        <li>Description: The description of a list item is empty.</li>
        <li>Children: There exists no children.</li>
@@ -55,26 +54,23 @@ service AccessibleListItem
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::TRANSIENT</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set
-               when the item is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::TRANSIENT
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when the item is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 6cf3b184ca82..d0bcd5197fc5 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -40,9 +40,8 @@ service AccessibleMenu
     /** This interface gives access to the structural information of a menu:
 
         <ul>
-        <li>Role: The role of a menu is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU</const>.</li>
+        <li>Role: The role of a menu is
+            com::sun::star::accessibility::AccessibleRole::MENU.</li>
         <li>Name: The name of a menu is the localized item text.</li>
         <li>Description: The description of a menu is its localized
             help text.</li>
@@ -57,33 +56,27 @@ service AccessibleMenu
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ARMED</const> is set
-                if the object is highlighted.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ARMED
+                is set if the object is highlighted.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -111,8 +104,7 @@ service AccessibleMenu
 
     /** This interface gives access to the numerical value of a
         menu, which is related to the menu's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::SELECTED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::SELECTED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index a61d9128e3a6..5ed8059e3e56 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -38,9 +38,8 @@ service AccessibleMenuBar
         menu bar:
 
         <ul>
-        <li>Role: The role of a menu bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU_BAR</const>.</li>
+        <li>Role: The role of a menu bar is
+        com::sun::star::accessibility::AccessibleRole::MENU_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a menu bar is its localized
             help text.</li>
@@ -52,27 +51,23 @@ service AccessibleMenuBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index d3628d8100c9..efbe09efe67b 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -40,9 +40,8 @@ service AccessibleMenuItem
         menu item:
 
         <ul>
-        <li>Role: The role of a menu item is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::MENU_ITEM</const>.</li>
+        <li>Role: The role of a menu item is
+        com::sun::star::accessibility::AccessibleRole::MENU_ITEM.</li>
         <li>Name: The name of a menu item is the localized item text.</li>
         <li>Description: The description of a menu item is its localized
             help text.</li>
@@ -54,33 +53,27 @@ service AccessibleMenuItem
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ARMED</const> is set
-                if the object is highlighted.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ARMED
+                is set if the object is highlighted.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -108,8 +101,7 @@ service AccessibleMenuItem
 
     /** This interface gives access to the numerical value of a
         menu item, which is related to the menu item's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::SELECTED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::SELECTED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 };
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 767d79402200..ff2a282f51eb 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -37,9 +37,8 @@ service AccessibleMenuSeparator
         menu separator:
 
         <ul>
-        <li>Role: The role of a menu separator is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::SEPARATOR</const>.</li>
+        <li>Role: The role of a menu separator is
+        com::sun::star::accessibility::AccessibleRole::SEPARATOR.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: There are no children.</li>
@@ -51,27 +50,23 @@ service AccessibleMenuSeparator
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li><com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li><com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index 63a6e19c3c31..b70db67a2b41 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -38,9 +38,8 @@ service AccessiblePopupMenu
         pop-up menu:
 
         <ul>
-        <li>Role: The role of a pop-up menu is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::POPUP_MENU</const>.</li>
+        <li>Role: The role of a pop-up menu is
+        com::sun::star::accessibility::AccessibleRole::POPUP_MENU.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a pop-up menu is its localized
             help text.</li>
@@ -52,27 +51,23 @@ service AccessiblePopupMenu
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 7954881a46c6..e065cb536efb 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -40,9 +40,8 @@ service AccessibleRadioButton
         radio button:
 
         <ul>
-        <li>Role: The role of a radio button is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::RADIO_BUTTON</const>.</li>
+        <li>Role: The role of a radio button is
+        com::sun::star::accessibility::AccessibleRole::RADIO_BUTTON.</li>
         <li>Name: The name of a radio button is its localized label.</li>
         <li>Description: The description of a radio button is its localized
             help text.</li>
@@ -50,36 +49,30 @@ service AccessibleRadioButton
         <li>Parent: The parent is the window that contains the radio button.</li>
         <li>Relations: The relations supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRelationType::MEMBER_OF</const> is set
-                if the object is a member of a group of one or more
+            <li>com::sun::star::accessibility::AccessibleRelationType::MEMBER_OF
+                is set if the object is a member of a group of one or more
                 target objects.</li>
             </ul>
             </li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+                is set if the object is currently checked.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
@@ -107,8 +100,7 @@ service AccessibleRadioButton
 
     /** This interface gives access to the numerical value of a
         radio button, which is related to the radio button's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::CHECKED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::CHECKED state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index 0bb66da59f33..3ad246c9fa85 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -39,9 +39,8 @@ service AccessibleScrollBar
         scroll bar:
 
         <ul>
-        <li>Role: The role of a scroll bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::SCROLL_BAR</const>.</li>
+        <li>Role: The role of a scroll bar is
+        com::sun::star::accessibility::AccessibleRole::SCROLL_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a scroll bar is its localized
             help text.</li>
@@ -50,31 +49,25 @@ service AccessibleScrollBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::HORIZONTAL</const> is set
-                if the orientation of the object is horizontal.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VERTICAL</const> is set
-                if the orientation of the object is vertical.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::HORIZONTAL
+                is set if the orientation of the object is horizontal.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VERTICAL
+                is set if the orientation of the object is vertical.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index dbc0bf80ad17..9cca466910cb 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -37,9 +37,8 @@ service AccessibleStatusBar
         status bar:
 
         <ul>
-        <li>Role: The role of a status bar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::STATUS_BAR</const>.</li>
+        <li>Role: The role of a status bar is
+        com::sun::star::accessibility::AccessibleRole::STATUS_BAR.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: The children of a status bar are status bar items,
@@ -49,20 +48,17 @@ service AccessibleStatusBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index b631e28ad40d..7b2cc61b92f5 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -38,9 +38,8 @@ service AccessibleStatusBarItem
         status bar item:
 
         <ul>
-        <li>Role: The role of a status bar item is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::LABEL</const>.</li>
+        <li>Role: The role of a status bar item is
+        com::sun::star::accessibility::AccessibleRole::LABEL.</li>
         <li>Name: The name of a status bar item is its localized
             configuration name.</li>
         <li>Description: The description of a status bar item is
@@ -52,19 +51,17 @@ service AccessibleStatusBarItem
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 853cce48f2f3..f8c3b316eb05 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -37,9 +37,8 @@ service AccessibleTabBar
         tabbar:
 
         <ul>
-        <li>Role: The role of a tabbar is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PANEL</const>.</li>
+        <li>Role: The role of a tabbar is
+        com::sun::star::accessibility::AccessibleRole::PANEL.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a tabbar is its localized
             help text.</li>
@@ -52,28 +51,23 @@ service AccessibleTabBar
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::RESIZABLE</const> is set
-                if the size of the object is not fixed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+                is set if the size of the object is not fixed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index b9c690c9b477..0d47e13cb43d 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -37,9 +37,8 @@ service AccessibleTabBarPage
         tabbar page:
 
         <ul>
-        <li>Role: The role of a tabbar page is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB</const>.</li>
+        <li>Role: The role of a tabbar page is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB.</li>
         <li>Name: The name of a tabbar page is the localized
             tabbar page text.</li>
         <li>Description: The description of a tabbar page is its localized
@@ -51,25 +50,21 @@ service AccessibleTabBarPage
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 40236510e886..849088455788 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -38,9 +38,8 @@ service AccessibleTabBarPageList
         tabbar page list:
 
         <ul>
-        <li>Role: The role of a tabbar page list is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB_LIST</const>.</li>
+        <li>Role: The role of a tabbar page list is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB_LIST.</li>
         <li>Name: There is no name.</li>
         <li>Description: There is no description.</li>
         <li>Children: The children of a tabbar page list are tabbar pages,
@@ -52,20 +51,17 @@ service AccessibleTabBarPageList
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index 17b6001415b0..36c99fa4dbc3 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -38,9 +38,8 @@ service AccessibleTabControl
         tab control:
 
         <ul>
-        <li>Role: The role of a tab control is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB_LIST</const>.</li>
+        <li>Role: The role of a tab control is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB_LIST.</li>
         <li>Name: There is no name.</li>
         <li>Description: The description of a tab control is its localized
             help text.</li>
@@ -52,25 +51,21 @@ service AccessibleTabControl
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 7e1c982a13a8..76de39818828 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -38,9 +38,8 @@ service AccessibleTabPage
         tab page:
 
         <ul>
-        <li>Role: The role of a tab page is <const
-            scope="com::sun::star::accessibility"
-            >AccessibleRole::PAGE_TAB</const>.</li>
+        <li>Role: The role of a tab page is
+        com::sun::star::accessibility::AccessibleRole::PAGE_TAB.</li>
         <li>Name: The name of a tab page is the localized tab page text.</li>
         <li>Description: The description of a tab page is its localized
             help text.</li>
@@ -51,30 +50,25 @@ service AccessibleTabPage
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+                is set if the object is selected.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 34e260f2c26b..2377077d9f70 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -49,9 +49,8 @@ service AccessibleTextField
     /** This interface gives access to the structural information of a text filed:
 
        <ul>
-       <li>Role: The role of a text filed is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TEXT</const>.</li>
+       <li>Role: The role of a text filed is
+       com::sun::star::accessibility::AccessibleRole::TEXT.</li>
        <li>Name: The name of a text filed is its localized label.</li>
        <li>Description: The description of a text filed is its localized
            help text.</li>
@@ -60,31 +59,25 @@ service AccessibleTextField
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index f8ebda52bec5..2d47013296ce 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -47,9 +47,8 @@ service AccessibleToolBox
     /** This interface gives access to the structural information of a tool box:
 
        <ul>
-       <li>Role: The role of a tool box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TOOL_BAR</const>.</li>
+       <li>Role: The role of a tool box is
+       com::sun::star::accessibility::AccessibleRole::TOOL_BAR.</li>
        <li>Name: The name of a tool box is its localized label.</li>
        <li>Description: The description of a tool box is its localized
            help text.</li>
@@ -59,37 +58,29 @@ service AccessibleToolBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VERTICAL</const> is set
-               if the tool box is vertical.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::HORIZONTAL</const> is set
-               if the tool box is horizontal.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VERTICAL
+               is set if the tool box is vertical.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::HORIZONTAL
+               is set if the tool box is horizontal.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index 3e81f990d061..d35325338d84 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -68,28 +68,23 @@ service AccessibleToolBoxItem
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::CHECKED</const> is set
-               if the tool box item is checked.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+               is set if the tool box item is checked.</li>
            </ul>
            </li>
        </ul>
@@ -113,8 +108,7 @@ service AccessibleToolBoxItem
     interface com::sun::star::accessibility::XAccessibleText;
     /** This interface gives access to the numerical value of a
         tool box item, which is related to the tool box item's
-        <const scope="com::sun::star::accessibility"
-        >AccessibleStateType::CHECKED</const> state.
+        com::sun::star::accessibility::AccessibleStateType::CHECKED state.
      */
     interface com::sun::star::accessibility::XAccessibleValue;
 };
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index 7090f2669e8f..5119965f851b 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -46,9 +46,8 @@ service AccessibleTreeListBox
     /** This interface gives access to the structural information of a tree list box:
 
        <ul>
-       <li>Role: The role of a tree list box is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::TREE</const>.</li>
+       <li>Role: The role of a tree list box is
+       com::sun::star::accessibility::AccessibleRole::TREE.</li>
        <li>Name: The name of a tree list box is its localized label.</li>
        <li>Description: The description of a tree list box is its localized
            help text.</li>
@@ -58,33 +57,27 @@ service AccessibleTreeListBox
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::FOCUSED</const> is set
-               if the object currently has the keyboard focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ACTIVE</const> is set
-               if a child has currently the focus.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::RESIZABLE</const> is set
-               if the object can be resized.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+               is set if the object currently has the keyboard focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+               is set if a child has currently the focus.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+               is set if the object can be resized.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE
+               is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index 154a6905e6fc..7984cb97da8e 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -50,9 +50,8 @@ service AccessibleTreeListBoxEntry
     /** This interface gives access to the structural information of a tree list box entry:
 
        <ul>
-       <li>Role: The role of a tree list box entry is <const
-           scope="com::sun::star::accessibility"
-           >AccessibleRole::LABEL</const>.</li>
+       <li>Role: The role of a tree list box entry is
+       com::sun::star::accessibility::AccessibleRole::LABEL.</li>
        <li>Name: The name of a tree list box entry is it's text.</li>
        <li>Description: The description of a tree list box entry is empty.</li>
        <li>Children: There can exist children of type com::sun::star::awt::AccessibleTreeListBoxEntry.
@@ -62,34 +61,31 @@ service AccessibleTreeListBoxEntry
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
            <ul>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::DEFUNC</const>
+           <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                is set if the object has already been disposed
                and subsequent calls to this object result in
                com::sun::star::lang::DisposedException
                exceptions.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::ENABLED</const> is set
-               if the object is enabled.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SHOWING</const> is set
-               if the object is displayed on the screen.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::VISIBLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EDITABLE</const> is set when a tree list box entry can be edited.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EXPANDABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::EXPANDED</const> is set when it is expanded.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::COLLAPSED</const> is set when it is collapsed.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::CHECKED</const> is set when it is checked.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTABLE</const> is always set.</li>
-           <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set when it is selected.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+               is set if the object is enabled.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+               is set if the object is displayed on the screen.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE
+               is set when a tree list box entry can be edited.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EXPANDABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::EXPANDED
+               is set when it is expanded.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::COLLAPSED
+               is set when it is collapsed.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::CHECKED
+               is set when it is checked.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE
+               is always set.</li>
+           <li>com::sun::star::accessibility::AccessibleStateType::SELECTED
+               is set when it is selected.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 4c9821e784f3..f5883c9e33f4 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -39,22 +39,14 @@ service AccessibleWindow
         <li>Role: The role of a window is not fixed. A window may have
             one of the following roles:
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::DIALOG</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::FRAME</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::LAYERED_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::PANEL</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::ROOT_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::SCROLL_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::SPLIT_PANE</const></li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleRole::WINDOW</const></li>
+            <li>com::sun::star::accessibility::AccessibleRole::DIALOG</li>
+            <li>com::sun::star::accessibility::AccessibleRole::FRAME</li>
+            <li>com::sun::star::accessibility::AccessibleRole::LAYERED_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::PANEL</li>
+            <li>com::sun::star::accessibility::AccessibleRole::ROOT_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::SCROLL_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::SPLIT_PANE</li>
+            <li>com::sun::star::accessibility::AccessibleRole::WINDOW</li>
             <li>...</li>
             </ul>
             </li>
@@ -66,34 +58,27 @@ service AccessibleWindow
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ACTIVE</const> is set
-                if the object is currently the active object.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::DEFUNC</const>
+            <li>com::sun::star::accessibility::AccessibleStateType::ACTIVE
+                is set if the object is currently the active object.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC
                 is set if the object has already been disposed
                 and subsequent calls to this object result in
                 com::sun::star::lang::DisposedException
                 exceptions.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::ENABLED</const> is set
-                if the object is enabled.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSABLE</const> is always set.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::FOCUSED</const> is set
-                if the object currently has the keyboard focus.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MODAL</const> is set
-                if the object is modal.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::RESIZABLE</const> is set
-                if the size of the object is not fixed.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::SHOWING</const> is set
-                if the object is displayed on the screen.</li>
-            <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::VISIBLE</const> is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::ENABLED
+                is set if the object is enabled.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE
+                is always set.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
+                is set if the object currently has the keyboard focus.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::MODAL
+                is set if the object is modal.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE
+                is set if the size of the object is not fixed.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::SHOWING
+                is set if the object is displayed on the screen.</li>
+            <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
+                is always set.</li>
             </ul>
             </li>
         </ul>
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index 96b238e9027f..56662975acbd 100644
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -32,8 +32,8 @@
 module com {  module sun {  module star {  module awt {
 
 
-/** The XExtendedToolkit is an extension of the <type
-    scope="::com::sun::star::awt">XToolkit</type> interface.  It basically
+/** The XExtendedToolkit is an extension of the
+    ::com::sun::star::awt::XToolkit interface.  It basically
     provides access to three event broadcasters which are used for instance
     in the context of accessibility.  It is, however, not restricted to
     accessibility.
@@ -95,8 +95,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     */
     ::com::sun::star::awt::XTopWindow getActiveTopWindow ();
 
-    /** Add a new listener that is called for events that involve <type
-        scope="::com::sun::star::awt">XTopWindow</type>s.  After having
+    /** Add a new listener that is called for events that involve
+        ::com::sun::star::awt::XTopWindow.  After having
         obtained the current list of existing top-level windows you can
         keep this list up-to-date by listening to opened or closed top-level
         windows.  Wait for activations or deactivations of top-level windows
@@ -121,8 +121,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
         [in] ::com::sun::star::awt::XTopWindowListener xListener);
 
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">KeyEvent</type>s.  Every listener is
+    /** Add a new listener that is called on
+        ::com::sun::star::awt::KeyEvent.  Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
@@ -145,8 +145,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
         [in] ::com::sun::star::awt::XKeyHandler xHandler);
 
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">FocusEvent</type>s.  Use this focus
+    /** Add a new listener that is called on
+        ::com::sun::star::awt::FocusEvent.  Use this focus
         broadcaster to keep track of the object that currently has the input
         focus.
         @param xListener
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index 2231e43a1455..a913694c38da 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -27,8 +27,8 @@
 
 module com {  module sun {  module star {  module awt {
 
-/** This key handler is similar to <type
-    scope="::com::sun::star::awt">XKeyListener</type> but allows the
+/** This key handler is similar to
+    ::com::sun::star::awt::XKeyListener but allows the
     consumption of key events.  If a key event is consumed by one
     handler both the following handlers, with respect to the list of key
     handlers of the broadcaster, and a following handling by the
@@ -38,8 +38,8 @@ module com {  module sun {  module star {  module awt {
 */
 published interface XKeyHandler : ::com::sun::star::lang::XEventListener
 {
-    /** This function is called by the broadcaster, an <type
-        scope="::com::sun::star::awt">XExtendedToolkit</type> for
+    /** This function is called by the broadcaster, an
+        ::com::sun::star::awt::XExtendedToolkit for
         instance, after a key has been pressed but before it is released.
         The return value decides about whether other handlers will be
         called and a handling by the broadcaster will take place.
@@ -62,8 +62,8 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
     */
     boolean keyPressed ([in] com::sun::star::awt::KeyEvent aEvent);
 
-    /** This function is called by the broadcaster, an <type
-        scope="::com::sun::star::awt">XExtendedToolkit</type> for
+    /** This function is called by the broadcaster, an
+        ::com::sun::star::awt::XExtendedToolkit for
         instance, after a key has been pressed and released.  The return
         value decides about whether other handlers will be called and a
         handling by the broadcaster will take place.
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index b386233bb074..a5ad737127c5 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -33,8 +33,8 @@ module com {  module sun {  module star {  module awt {
  */
 published interface XUserInputInterception : ::com::sun::star::uno::XInterface
 {
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">KeyEvent</type>s.  Every listener is
+    /** Add a new listener that is called on ::com::sun::star::awt::KeyEvent.
+        Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
@@ -56,8 +56,8 @@ published interface XUserInputInterception : ::com::sun::star::uno::XInterface
     void removeKeyHandler (
         [in] ::com::sun::star::awt::XKeyHandler xHandler);
 
-    /** Add a new listener that is called on <type
-        scope="::com::sun::star::awt">MouseEvent</type>s.  Every listener is
+    /** Add a new listener that is called on ::com::sun::star::awt::MouseEvent.
+        Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
         called listeners from being called.
         @param xHandler
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 778664420f43..69150290deaf 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -29,7 +29,8 @@
 module com {  module sun {  module star {  module awt {  module grid {
 
 
-/** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
+/** The XGridColumn defines the properties and behavior of a column
+    in a grid control.
     @since OOo 3.3
  */
 published interface XGridColumn