*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

24 files changed, 130 insertions, 158 deletions

diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl
index 2efde9031595..73b063f7c5c5 100644
--- a/udkapi/com/sun/star/beans/Ambiguous.idl
+++ b/udkapi/com/sun/star/beans/Ambiguous.idl
@@ -25,9 +25,8 @@ module com {  module sun {  module star {  module beans {
    A value of a given type that can be ambiguous.
 
    <p>This structure is used as the type of interface attributes corresponding
-   to instances of <type scopye="com::sun::star::beans">Property</type> that
-   have the <const
-   scope="com::sun::star::beans">PropertyAttribute::MAYBEAMBIGUOUS</const>.</p>
+   to instances of com::sun::star::beans::Property that
+   have the com::sun::star::beans::PropertyAttribute::MAYBEAMBIGUOUS.</p>
  */
 struct Ambiguous<T> {
     /**
diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl
index b3e5a1ea3504..b7f816e59242 100644
--- a/udkapi/com/sun/star/beans/Defaulted.idl
+++ b/udkapi/com/sun/star/beans/Defaulted.idl
@@ -25,9 +25,8 @@ module com {  module sun {  module star {  module beans {
    A value of a given type that can be defaulted.
 
    <p>This structure is used as the type of interface attributes corresponding
-   to instances of <type scopye="com::sun::star::beans">Property</type> that
-   have the <const
-   scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>.</p>
+   to instances of com::sun::star::beans::Property that
+   have the com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT.</p>
  */
 struct Defaulted<T> {
     /**
diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 706dc27ff082..45b33ce83e84 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -28,11 +28,10 @@
 /** provides functionality to get information about an object's
     properties and methods.
     <p><strong>Important note:</strong>An object can only be
-    inspected completely if it supports the <type scope=
-    "com::sun::star::lang">XTypeProvider</type> interface.</p>
+    inspected completely if it supports the
+    com::sun::star::lang::XTypeProvider interface.</p>
 
-    <p>For details see method <member>XIntrospection::inspect
-    </member>.</p>
+    <p>For details see method XIntrospection::inspect() .</p>
  */
 published service Introspection : com::sun::star::beans::XIntrospection;
 
diff --git a/udkapi/com/sun/star/beans/MethodConcept.idl b/udkapi/com/sun/star/beans/MethodConcept.idl
index 613c87593df4..8d34a054f0da 100644
--- a/udkapi/com/sun/star/beans/MethodConcept.idl
+++ b/udkapi/com/sun/star/beans/MethodConcept.idl
@@ -67,8 +67,8 @@ published constants MethodConcept
 
         <p>These methods have the signature
         <code>create...Enumeration</code> and return an interface
-        that is derived from <type scope="com::sun::star::container">
-        XEnumeration</type> Additionally, the method
+        that is derived from com::sun::star::container::XEnumeration.
+        Additionally, the method
         com::sun::star::container::XEnumerationAccess::getElementType()
         belongs to this concept.</p>
      */
@@ -95,8 +95,7 @@ published constants MethodConcept
         <code>insert...ByIndex()</code>,
         <code>replace...ByIndex()</code>, or
         <code>remove...ByIndex()</code>.
-        The method <member scope="com::sun::star::container">
-        XIndexAccess::getCount()</member>
+        The method com::sun::star::container::XIndexAccess::getCount()
         also belongs to this concept. </p>
      */
     const long INDEXCONTAINER = 32;
diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl
index 08974c9fe969..e7ab5f20e4d3 100644
--- a/udkapi/com/sun/star/beans/Optional.idl
+++ b/udkapi/com/sun/star/beans/Optional.idl
@@ -25,9 +25,8 @@ module com {  module sun {  module star {  module beans {
    An optional value of a given type.
 
    <p>This structure is used as the type of interface attributes corresponding
-   to instances of <type scopye="com::sun::star::beans">Property</type> that
-   have the <const
-   scope="com::sun::star::beans">PropertyAttribute::MAYBEVOID</const>.  It might
+   to instances of com::sun::star::beans::Property that
+   have the com::sun::star::beans::PropertyAttribute::MAYBEVOID.  It might
    also be useful in other situations, for example as the return type of an
    interface method.</p>
  */
diff --git a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
index 950ceecaea75..f5450887f3b2 100644
--- a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
+++ b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
@@ -42,7 +42,7 @@ constants TolerantPropertySetResultType
     /** the property is not available.
 
         <p>For example if a
-        <type scope="com::sun::star::beans" >UnknownPropertyException</type>
+        com::sun::star::beans::UnknownPropertyException
         was catched.</p>
     */
     const short UNKNOWN_PROPERTY    = 1;
@@ -50,7 +50,7 @@ constants TolerantPropertySetResultType
     /** the value used with the property is not valid.
 
         <p>For example if a
-        <type scope="com::sun::star::lang" >IllegalArgumentException</type>
+        com::sun::star::lang::IllegalArgumentException
         was catched.</p>
     */
     const short ILLEGAL_ARGUMENT    = 2;
@@ -58,7 +58,7 @@ constants TolerantPropertySetResultType
     /** the property could not be changed at that time.
 
         <p>For example if a
-        <type scope="com::sun::star::beans" >PropertyVetoException</type>
+        com::sun::star::beans::PropertyVetoException
         was catched.</p>
     */
     const short PROPERTY_VETO       = 3;
diff --git a/udkapi/com/sun/star/beans/XIntrospection.idl b/udkapi/com/sun/star/beans/XIntrospection.idl
index ca19c2785e4f..9fdb736fc66c 100644
--- a/udkapi/com/sun/star/beans/XIntrospection.idl
+++ b/udkapi/com/sun/star/beans/XIntrospection.idl
@@ -30,8 +30,8 @@
 /** allows the inspection of an object's properties and methods.
 
     <p><strong>Important note:</strong>An object can only be
-    inspected completely if it supports the <type scope=
-    "com::sun::star::lang">XTypeProvider</type> interface.</p>
+    inspected completely if it supports the com::sun::star::lang::XTypeProvider
+    interface.</p>
 
     <p>For details see method XIntrospection::inspect(). </p>
 
diff --git a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
index 3e1f8fef2c5c..be325005f117 100644
--- a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
+++ b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
@@ -38,21 +38,19 @@
 
 
 /** represents the result of an introspection operation done by
-    the inspect method of <type scope="com::sun::star::beans">
-    XIntrospection</type>.
+    the inspect method of XIntrospection.
 
     <p>This interface gives information about an object's
     properties and methods as detected in the introspection
     process. It's not possible to access properties or call
     methods directly using this interface but it provides
     access to other interfaces to do so.
-    See <member scope="com::sun::star::beans">
-    XIntrospectionAccess::queryAdapter()</member></p>
+    See com::sun::star::beans::XIntrospectionAccess::queryAdapter()</p>
 
     <p>The XExactName interface has to be supported
     in order to implement inaccurate name access for all objects
-    which implement the <type scope="com::sun::star::container">
-    XNameAccess</type> interface or XPropertySet.</p>
+    which implement the com::sun::star::container::XNameAccess interface
+    or XPropertySet.</p>
 
     <p>The XMaterialHolder interface has to be
     supported to give access to the inspected object.</p>
@@ -114,22 +112,20 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             the name of the property.
 
         @param nPropertyConcepts
-            zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the PropertyConcept
+            constants group combined by an arithmetical
             or-operation.
 
         @throws NoSuchElementException
             when a property with the demanded name doesn't exist
-            or if it accords to a wrong <type>PropertyConcept
-            </type>.
+            or if it accords to a wrong PropertyConcept.
      */
     com::sun::star::beans::Property getProperty( [in] string aName,
              [in] long nPropertyConcepts )
             raises( com::sun::star::container::NoSuchElementException );
 
     /** allows to ask if a property with the demanded name exists
-        and if it accords to one of the demanded <type>
-        PropertyConcept</type>s.
+        and if it accords to one of the demanded PropertyConcept.
 
         @returns
             `TRUE` if the property exists and accords to one of
@@ -140,8 +136,8 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             the name of the property.
 
         @param nPropertyConcepts
-            zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the PropertyConcept
+            constants group combined by an arithmetical
             or-operation.
      */
     boolean hasProperty( [in] string aName,
@@ -154,8 +150,8 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             to the demanded PropertyConcepts.
 
         @param nPropertyConcepts
-            zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the PropertyConcept
+            constants group combined by an arithmetical
             or-operation.
      */
     sequence<com::sun::star::beans::Property> getProperties(
@@ -164,12 +160,11 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
     /** returns information about a method if a method with
         the demanded name exists and if it accords to one of
         the demanded MethodConcepts. The information is
-        provided as <type scope="com::sun::star::reflection">
-        XIdlMethod</type>.
+        provided as com::sun::star::reflection::XIdlMethod.
 
         @returns
-            A <type scope="com::sun::star::reflection">
-            XIdlMethod</type> providing information about and
+            A com::sun::star::reflection::XIdlMethod providing
+            information about and
             access to the demanded method if a corresponding
             method exists.
 
@@ -177,8 +172,8 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             the name of the method.
 
         @param nMethodConcepts
-            zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the MethodConcept
+            constants group combined by an arithmetical
             or-operation.
 
         @throws NoSuchElementException
@@ -190,8 +185,7 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::NoSuchMethodException );
 
     /** allows to ask if a method with the demanded name exists
-        and if it accords to one of the demanded <type>MethodConcept
-        </type>s.
+        and if it accords to one of the demanded MethodConcept.
 
         @returns
             `TRUE` if the method exists and accords to one of
@@ -202,8 +196,8 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             the name of the method.
 
         @param nMethodConcepts
-            zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the MethodConcept
+            constants group combined by an arithmetical
             or-operation.
      */
     boolean hasMethod( [in] string aName,
@@ -216,8 +210,8 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             to the demanded MethodConcepts.
 
         @param nMethodConcepts
-            zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            zero or more constants of the MethodConcept
+            constants group combined by an arithmetical
             or-operation.
      */
     sequence<com::sun::star::reflection::XIdlMethod> getMethods(
@@ -241,36 +235,32 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
     /** creates an adapter that implements an interface with the
         specified type.
 
-        <p>To access properties, query for the <type>XPropertySet
-        </type> interface. If the XPropertySet can
+        <p>To access properties, query for the XPropertySet
+        interface. If the XPropertySet can
         be queried, the XFastPropertySet interface
         must be supported too.  </p>
 
         <p>If the introspected object implements a name container,
-        the introspection should return the <type scope=
-        "com::sun::star::container">XNameAccess</type> and <type
-        scope="com::sun::star::container">XNameContainer</type>
-        interfaces.</p>
+        the introspection should return the
+        com::sun::star::container::XNameAccess and
+        com::sun::star::container::XNameContainer interfaces.</p>
 
         <p>If the introspected object implements an index container,
-        the introspection should return the <type scope=
-        "com::sun::star::container">XIndexAccess</type> and <type
-        scope="com::sun::star::container">XIndexContainer</type>
-        interfaces.</p>
+        the introspection should return the
+        com::sun::star::container::XIndexAccess and
+        com::sun::star::container::XIndexContainer interfaces.</p>
 
         <p>If the introspected object implements an enumeration
-        container, the introspection should return the <type scope=
-        "com::sun::star::container">XEnumerationAccess</type>
-        interface.</p>
+        container, the introspection should return the
+        com::sun::star::container::XEnumerationAccess interface.</p>
 
-        <p>If the introspected object implements the <type scope=
-        "com::sun::star::reflection">XIdlArray</type> interface,
+        <p>If the introspected object implements the
+        com::sun::star::reflection::XIdlArray interface,
         the introspection should return this.</p>
 
         <p>To implement inaccurate name access, at all objects,
-        which implement the <type scope="com::sun::star::container">
-        XNameAccess</type> or XPropertySet interface,
-        the XExactName interface has to be supported.
+        which implement the com::sun::star::container::XNameAccess or
+        XPropertySet interface, the XExactName interface has to be supported.
         </p>
 
         @see com::sun::star::beans::XExactName
diff --git a/udkapi/com/sun/star/container/XIdentifierAccess.idl b/udkapi/com/sun/star/container/XIdentifierAccess.idl
index b78989c40204..aa527be3682b 100644
--- a/udkapi/com/sun/star/container/XIdentifierAccess.idl
+++ b/udkapi/com/sun/star/container/XIdentifierAccess.idl
@@ -44,7 +44,7 @@ published interface XIdentifierAccess: com::sun::star::container::XElementAccess
 
         @throws  com::sun::star::lang::WrappedTargetException
             If the implementation has internal reasons for exceptions,
-            then wrap these in a <typee scope="com::sun::star::lang">WrappedTargetException</type>
+            then wrap these in a com::sun::star::lang::WrappedTargetException
             exception.
      */
     any getByIdentifier( [in] long Identifierr )
diff --git a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
index e8363eb1e7c3..f30bc4979c29 100644
--- a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
+++ b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
@@ -42,8 +42,8 @@ module com { module sun { module star { module io {
    such an output stream shall not be closed immediately after one or more calls
    to com::sun::star::io::XOutputStream::writeBytes(), but
    the client wants to know as soon as possible whether writing was successful,
-   then <member
-   scope="com::sun::star::io">XAsyncOutputMonitor::waitForCompletion</member>
+   then
+   com::sun::star::io::XAsyncOutputMonitor::waitForCompletion()
    should be called after the series of calls to
    com::sun::star::io::XOutputStream::writeBytes().</p>
 
@@ -70,9 +70,8 @@ interface XAsyncOutputMonitor {
        give this guarantee).</p>
 
        @throws com::sun::star::io::IOException
-       if any previous call to <member
-       scope="com::sun::star::io">XOutputStream::writeBytes</member> encountered
-       such an error, but has not yet reported it (in cases where
+       if any previous call to com::sun::star::io::XOutputStream::writeBytes()
+       encountered such an error, but has not yet reported it (in cases where
        <code>writeBytes</code> operates asynchronously).
     */
     void waitForCompletion() raises (IOException);
diff --git a/udkapi/com/sun/star/io/XOutputStream.idl b/udkapi/com/sun/star/io/XOutputStream.idl
index 7eb260b5c9b3..a8b9defc4661 100644
--- a/udkapi/com/sun/star/io/XOutputStream.idl
+++ b/udkapi/com/sun/star/io/XOutputStream.idl
@@ -46,8 +46,8 @@ published interface XOutputStream: com::sun::star::uno::XInterface
     /** flushes out of the stream any data that may exist in buffers.
 
         <p>The semantics of this method are rather vague.  See
-        <member scope="com::sun::star::io">
-        XAsyncOutputMonitor::waitForCompletion</member> for a similar method
+        com::sun::star::io::XAsyncOutputMonitor::waitForCompletion()
+        for a similar method
         with very specific semantics, that is useful in certain scenarios.</p>
      */
     void flush()
diff --git a/udkapi/com/sun/star/io/XTextInputStream.idl b/udkapi/com/sun/star/io/XTextInputStream.idl
index 2a8eee42e8bf..e0a821496a06 100644
--- a/udkapi/com/sun/star/io/XTextInputStream.idl
+++ b/udkapi/com/sun/star/io/XTextInputStream.idl
@@ -72,8 +72,8 @@ published interface XTextInputStream: com::sun::star::io::XInputStream
         of the stream is reached.</p>
         <p><strong>Important:</strong>
         This cannot be detected by asking for an empty string
-        because that can be a valid return value of <member>
-        readLine()</member> (if the line is empty) and
+        because that can be a valid return value of readLine()
+        (if the line is empty) and
         readString() (if a delimiter is directly followed
         by the next one).</p>
 
diff --git a/udkapi/com/sun/star/io/XTextOutputStream.idl b/udkapi/com/sun/star/io/XTextOutputStream.idl
index 102c8d18de97..26eb0e2b4e1c 100644
--- a/udkapi/com/sun/star/io/XTextOutputStream.idl
+++ b/udkapi/com/sun/star/io/XTextOutputStream.idl
@@ -31,8 +31,8 @@ module com {  module sun {  module star {  module io {
     character encoding.
 
     <p>This interfaces allows to write strings to a stream.
-    The character encoding to be used can be set by <member>
-    setEncoding()</member>. Default encoding is "utf8".</p>
+    The character encoding to be used can be set by
+    setEncoding(). Default encoding is "utf8".</p>
  */
 published interface XTextOutputStream: com::sun::star::io::XOutputStream
 {
diff --git a/udkapi/com/sun/star/java/JavaInitializationException.idl b/udkapi/com/sun/star/java/JavaInitializationException.idl
index 1ba0e870452f..e8a3b7aff386 100644
--- a/udkapi/com/sun/star/java/JavaInitializationException.idl
+++ b/udkapi/com/sun/star/java/JavaInitializationException.idl
@@ -33,10 +33,10 @@ module com { module sun { module star { module java {
     other exceptions in this namespace which inherit JavaInitializationException.
     These are:
     <p>
-    <type scope:"com::sun::star::java">JavaDisabledException</type> <br>
-    <type scope:"com::sun::star::java">JavaNotConfiguredException</type> <br>
-    <type scope:"com::sun::star::java">MissingJavaRuntimeException</type> <br>
-    <type scope:"com::sun::star::java">JavaVMCreationFailureException</type> <br>
+    com::sun::star::java::JavaDisabledException <br>
+    com::sun::star::java::JavaNotConfiguredException <br>
+    com::sun::star::java::MissingJavaRuntimeException <br>
+    com::sun::star::java::JavaVMCreationFailureException <br>
 
     @since OOo 1.1.2
  */
diff --git a/udkapi/com/sun/star/lang/Locale.idl b/udkapi/com/sun/star/lang/Locale.idl
index 8be2fe8462de..f45af42dd83a 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module lang {
 
     <p> Each implementation that performs locale-sensitive operations
     allows you to get all the available objects of that type. Use the
-    <typed scope="com::sun::star::resource">XLocale</type> interface to set the locale. </p>
+    com::sun::star::resource::XLocale interface to set the locale. </p>
  */
 published struct Locale
 {
diff --git a/udkapi/com/sun/star/lang/XComponent.idl b/udkapi/com/sun/star/lang/XComponent.idl
index 7423937bb360..7f03ba6f39ec 100644
--- a/udkapi/com/sun/star/lang/XComponent.idl
+++ b/udkapi/com/sun/star/lang/XComponent.idl
@@ -81,14 +81,14 @@ published interface XComponent: com::sun::star::uno::XInterface
         thus for each time a listener is added, it has to be removed.</p>
 
         <p>If this com::sun::star::lang::XComponent is
-        already disposed when <member scope="com::sun::star::lang">
-        XComponent::addEventListener</member> is called, the call will not fail
+        already disposed when
+        com::sun::star::lang::XComponent::addEventListener()
+        is called, the call will not fail
         with a com::sun::star::lang::DisposedException, but
         the caller will be notified via the
         com::sun::star::lang::XEventListener::disposing()
         callback.  This callback can occur synchronously within the
-        <member scope="com::sun::star::lang">XComponent::addEventListener
-        </member> call.</p>
+        com::sun::star::lang::XComponent::addEventListener() call.</p>
 
         @see XComponent::removeEventListener
      */
@@ -102,8 +102,9 @@ published interface XComponent: com::sun::star::uno::XInterface
         thus for each time a listener is added, it has to be removed.
 
         <p>If this com::sun::star::lang::XComponent is
-        already disposed when <member scope="com::sun::star::lang">
-        XComponent::removeEventListener</member> is called, the call will not
+        already disposed when
+        com::sun::star::lang::XComponent::removeEventListener()
+        is called, the call will not
         fail with a com::sun::star::lang::DisposedException,
         but will rather be ignored silently.</p>
 
diff --git a/udkapi/com/sun/star/reflection/XIdlField2.idl b/udkapi/com/sun/star/reflection/XIdlField2.idl
index 8e1777853b60..5c77f6b0f99a 100644
--- a/udkapi/com/sun/star/reflection/XIdlField2.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField2.idl
@@ -61,8 +61,7 @@ published interface XIdlField2: com::sun::star::reflection::XIdlMember
 
         <p>When setting an interface attribute raises a
         non-com::sun::star::uno::RuntimeException, it is
-        wrapped in a <type
-        scope="com::sun::star::lang">WrappedTargetRuntimeException</type>.</p>
+        wrapped in a com::sun::star::lang::WrappedTargetRuntimeException.</p>
 
         @param obj
                object instance having member of reflected type
@@ -83,8 +82,7 @@ published interface XIdlField2: com::sun::star::reflection::XIdlMember
 
         <p>When setting an interface attribute raises a
         non-com::sun::star::uno::RuntimeException, it is
-        wrapped in a <type
-        scope="com::sun::star::lang">WrappedTargetRuntimeException</type>.</p>
+        wrapped in a com::sun::star::lang::WrappedTargetRuntimeException.</p>
 
         @param obj
                object instance having member of reflected type
diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
index 0bc56d7a9ad8..a48e51c66df8 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
@@ -40,10 +40,9 @@ interface XInterfaceTypeDescription2: XInterfaceTypeDescription {
         @returns
         a sequence of all directly inherited (mandatory) base interface types,
         in the correct order; each element of the returned sequence will be the
-        reflection of either an interface type (of type <type
-        scope="com::sun::star::reflection">XInterfaceTypeDescription</type>) or
-        a typedef (of type <type
-        scope="com::sun::star::reflection">XIndirectTypeDescription</type>)
+        reflection of either an interface type (of
+        type com::sun::star::reflection::XInterfaceTypeDescription) or
+        a typedef (of type com::sun::star::reflection::XIndirectTypeDescription)
         that&mdash;directly or indirectly&mdash;denotes an interface type
      */
     sequence<XTypeDescription> getBaseTypes();
@@ -54,10 +53,9 @@ interface XInterfaceTypeDescription2: XInterfaceTypeDescription {
         @returns
         a sequence of all directly inherited optional base interface types, in
         the correct order; each element of the returned sequence will be the
-        reflection of either an interface type (of type <type
-        scope="com::sun::star::reflection">XInterfaceTypeDescription</type>) or
-        a typedef (of type <type
-        scope="com::sun::star::reflection">XIndirectTypeDescription</type>)
+        reflection of either an interface type (of type
+        com::sun::star::reflection::XInterfaceTypeDescription) or
+        a typedef (of type com::sun::star::reflection::XIndirectTypeDescription)
         that&mdash;directly or indirectly&mdash;denotes an interface type
      */
     sequence<XTypeDescription> getOptionalBaseTypes();
diff --git a/udkapi/com/sun/star/reflection/XPublished.idl b/udkapi/com/sun/star/reflection/XPublished.idl
index b5e008a40f67..75d5266bdf86 100644
--- a/udkapi/com/sun/star/reflection/XPublished.idl
+++ b/udkapi/com/sun/star/reflection/XPublished.idl
@@ -43,47 +43,43 @@ module com {  module sun {  module star {  module reflection {
        (com::sun::star::reflection::XStructTypeDescription),
        polymorphic struct type templates
        (com::sun::star::reflection::XStructTypeDescription),
-       exception types (<type
-       scope="com::sun::star::reflection">XCompoundTypeDescription</type>),
-       interface types (<type
-       scope="com::sun::star::reflection">XInterfaceTypeDescription2</type>),
-       typedefs (<type
-       scope="com::sun::star::reflection">XIndirectTypeDescription</type>),
-       individual constants (<type
-       scope="com::sun::star::reflection">XConstantTypeDescription</type>),
-       constant groups (<type
-       scope="com::sun::star::reflection">XConstantsTypeDescription</type>),
-       single-interface&ndash;based services (<type
-       scope="com::sun::star::reflection">XServiceTypeDescription2</type>),
-       accumulation-based services (<type
-       scope="com::sun::star::reflection">XServiceTypeDescription2</type>),
-       interface-based singletons (<type
-       scope="com::sun::star::reflection">XSingletonTypeDescription2</type>),
-       and service-based singletons (<type
-       scope="com::sun::star::reflection">XSingletonTypeDescription2</type>)
+       exception types (com::sun::star::reflection::XCompoundTypeDescription),
+       interface types (com::sun::star::reflection::XInterfaceTypeDescription2),
+       typedefs (com::sun::star::reflection::XIndirectTypeDescription),
+       individual constants
+       (com::sun::star::reflection::XConstantTypeDescription),
+       constant groups (com::sun::star::reflection::XConstantsTypeDescription),
+       single-interface&ndash;based services
+       (com::sun::star::reflection::XServiceTypeDescription2),
+       accumulation-based services
+       (com::sun::star::reflection::XServiceTypeDescription2),
+       interface-based singletons
+       (com::sun::star::reflection::XSingletonTypeDescription2),
+       and service-based singletons
+       (com::sun::star::reflection::XSingletonTypeDescription2)
        support the notion of being published.  Therefore, for an object that
        represents any such entity,
        com::sun::star::reflection::XPublished should be
        supported.</li>
 
-       <li>Sequence types (<type
-       scope="com::sun::star::reflection">XIndirectTypeDescription</type>),
+       <li>Sequence types
+       (com::sun::star::reflection::XIndirectTypeDescription),
        type parameters of polymorphic struct type templates
        (com::sun::star::reflection::XTypeDescription),
        instantiated polymorphic struct types
        (com::sun::star::reflection::XStructTypeDescription),
-       attributes of interface types (<type scope="com::sun::star::reflection">
-       XInterfaceAttributeTypeDescription2</type>), methods of interface types
-       (<type scope="com::sun::star::reflection">
-       XInterfaceMethodTypeDescription</type>), properties of
-       accumulation-based services (<type
-       scope="com::sun::star::reflection">XPropertyTypeDescription</type>),
+       attributes of interface types
+       (com::sun::star::reflection::XInterfaceAttributeTypeDescription2),
+       methods of interface types
+       (com::sun::star::reflection::XInterfaceMethodTypeDescription),
+       properties of accumulation-based services
+       (com::sun::star::reflection::XPropertyTypeDescription),
        deprecated
        com::sun::star::reflection::XArrayTypeDescriptions,
        and deprecated
        com::sun::star::reflection::XUnionTypeDescriptions do
-       not support the notion of being published.  Therefore, for an object that
-       represents any such entity,
+       not support the notion of being published.
+       Therefore, for an object that represents any such entity,
        com::sun::star::reflection::XPublished should not be
        supported.</li>
    </ul>
diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
index afa0e99e271a..223c769c55cf 100644
--- a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
@@ -50,10 +50,9 @@ interface XServiceTypeDescription2: XServiceTypeDescription {
        Returns the interface type associated with the service.
 
        @return the reflection of the interface type associated with the service
-           (of type <type
-           scope="com::sun::star::reflection">XInterfaceTypeDescription</type>
-           or, in case of a typedef, <type
-           scope="com::sun::star::reflection">XIndirectTypeDescription</type>),
+           (of type com::sun::star::reflection::XInterfaceTypeDescription
+           or, in case of a typedef,
+           com::sun::star::reflection::XIndirectTypeDescription),
            for a single-interface&ndash;based service; for an obsolete,
            accumulation-based service, `NULL` is returned
      */
diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
index 90c32d184a62..e2319c5386d8 100644
--- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
@@ -47,10 +47,10 @@ interface XSingletonTypeDescription2: XSingletonTypeDescription {
        Returns the interface type associated with the singleton.
 
        @return the reflection of the interface type associated with the
-           singleton (of type <type
-           scope="com::sun::star::reflection">XInterfaceTypeDescription</type>
-           or, in case of a typedef, <type
-           scope="com::sun::star::reflection">XIndirectTypeDescription</type>),
+           singleton (of type
+           com::sun::star::reflection::XInterfaceTypeDescription
+           or, in case of a typedef,
+           com::sun::star::reflection::XIndirectTypeDescription),
            for an interface-based singleton; for an obsolete, service-based
            singleton, `NULL` is returned
      */
diff --git a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
index 8201ce58d468..a46d6bf033cb 100644
--- a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
@@ -36,26 +36,23 @@ interface XTypeDescription;
    <ul>
        <li>Polymorphic struct type templates, like
        <code>Struct&lt;T, U&gt;</code>.  For these,
-       <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeParameters</member> returns a non-empty
-       sequence, while <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeArguments</member> returns an empty
-       sequence.</li>
+       com::sun::star::reflection::XStructTypeDescription::getTypeParameters()
+       returns a non-empty sequence, while
+       com::sun::star::reflection::XStructTypeDescription::getTypeArguments()
+       returns an empty sequence.</li>
 
        <li>Instantiated polymorphic struct types, like <code>Struct&lt;long,
        hyper&gt;</code>.  For these,
-       <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeParameters</member> returns an empty
-       sequence, while <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeArguments</member> returns a non-empty
-       sequence.</li>
+       com::sun::star::reflection::XStructTypeDescription::getTypeParameters()
+       returns an empty sequence, while
+       com::sun::star::reflection::XStructTypeDescription::getTypeArguments()
+       returns a non-empty sequence.</li>
 
        <li>Plain struct types.  For these, both
-       <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeParameters</member> and
-       <member scope="com::sun::star::reflection"><!--
-       -->XStructTypeDescription::getTypeArguments</member> return an empty
-       sequence.</li>
+       com::sun::star::reflection::XStructTypeDescription::getTypeParameters()
+       and
+       com::sun::star::reflection::XStructTypeDescription::getTypeArguments()
+       return an empty sequence.</li>
    </ul>
 
    @since OOo 2.0
diff --git a/udkapi/com/sun/star/script/XEventAttacherManager.idl b/udkapi/com/sun/star/script/XEventAttacherManager.idl
index d2e071f3607d..cb41dbfa266d 100644
--- a/udkapi/com/sun/star/script/XEventAttacherManager.idl
+++ b/udkapi/com/sun/star/script/XEventAttacherManager.idl
@@ -53,8 +53,8 @@ published interface XEventAttacherManager: com::sun::star::uno::XInterface
 
     /** registers several events for an object identified by its index.
 
-        <p>The result is the same as if the method <member>registerScriptEvent
-        </member> was called once for each ScriptEventDescriptor
+        <p>The result is the same as if the method registerScriptEvent()
+        was called once for each ScriptEventDescriptor
         in the sequence.</p>
 
         <p>If any object is attached under this index, then this
diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
index 72f87c031565..5a20c9646505 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
@@ -56,8 +56,7 @@ published interface XVndSunStarExpandUrl {
        the expanded content of this URL.
 
        @throws com::sun::star::lang::IllegalArgumentException
-       if calling <member
-       scope="com::sun::star::util">XMacroExpander::expandMacros</member> on
+       if calling com::sun::star::util::XMacroExpander::expandMacros() on
        <code>expander</code> raises any such exception.
      */
     string expand([in] com::sun::star::util::XMacroExpander expander)