*api: fix up merge conflict damage

Change-Id: I3a1281c756305f16d193210839ca6b826662698e

3 files changed, 17 insertions, 16 deletions

diff --git a/offapi/com/sun/star/frame/XLoaderFactory.idl b/offapi/com/sun/star/frame/XLoaderFactory.idl
index 31248418e029..ac6f61490cf9 100644
--- a/offapi/com/sun/star/frame/XLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/XLoaderFactory.idl
@@ -37,8 +37,8 @@ published interface XLoaderFactory
     /** interface to create loader objects by using his internal name
 
         <p>
-        Returned objects must support the service specification of a <type>FrameLoader</type>
-        or <type>SynchronousFrameLoader</type>. (Note: last one will be preferred if both ones
+        Returned objects must support the service specification of a FrameLoader
+        or SynchronousFrameLoader. (Note: last one will be preferred if both
         are available)
         They can be created by using of his internal name, which must be unambiguous everytime, only.
         To get this name use further specified interfaces of this factory for access on
@@ -50,8 +50,9 @@ published interface XLoaderFactory
     /** provides access to the whole frame loader configuration
 
     <p>This interface supports an access to the internal configuration of all accessible loader objects.
-        The return value of <member scope="com::sun::star::container">XNameAccess::getByName()</member>
-    is a property sequence packed in an any.  </p>
+        The return value of com::sun::star::container::XNameAccess::getByName()
+        is a property sequence packed in an any.
+    </p>
         <table border=1>
             <tr>
                 <td><b>Types<b></td>
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index 313dbe708a7b..760ee69b5036 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -60,28 +60,28 @@ interface XStatusbarController
 
         <p>A status bar controller is initialized with <b>five</b> additional
         arguments provided as a sequence of
-        <type scope="com::sun::star::beans">PropertyValue</type>:</p>
+        com::sun::star::beans::PropertyValue:</p>
 
         <ul>
-            <li><b>Frame</b><br/>a <type scope="com::sun::star::frame">XFrame</type>
+            <li><b>Frame</b><br/>a com::sun::star::frame::XFrame
                 instance to which the status bar controller belongs.
             </li>
             <li><b>CommandURL</b><br/>a string which specifies the command
-                associated with the statusbar controller.</br>
+                associated with the statusbar controller.<br>
                 The command is used to identify the status bar controller
                 implementation.
             </li>
-            <li><b>StatusbarItem</b><br/>a <type scope="com::sun::star::ui">XStatusbarItem</type>
+            <li><b>StatusbarItem</b><br/>a com::sun::star::ui::XStatusbarItem
                 instance which represents the status bar item asociated with
                 this controller.
             </li>
-            <li><b>ParentWindow</b><br/>a <type scope="com::sun::star::awt">Window</type>
+            <li><b>ParentWindow</b><br/>a com::sun::star::awt::Window
                 instance which represents the parent window (status bar window).
             </li>
             <li><b>ModuleName</b><br/>a string which specifies the name of the
                 office module attached to the frame to which this controller
                 belongs; the value is taken from
-                <member scope="com::sun::star::frame">XModuleManager::identify()</member>.
+                com::sun::star::frame::XModuleManager::identify().
             </li>
         </ul>
     */
@@ -91,7 +91,7 @@ interface XStatusbarController
         changed.
 
         <p>The status bar controller implementation should register itself as a
-        listener when its <member scope="com::sun::star::util">XUpdatable</member>
+        listener when its com::sun::star::util::XUpdatable
         interface has been called.</p>
     */
     interface com::sun::star::frame::XStatusListener;
@@ -157,7 +157,7 @@ interface XStatusbarController
 
         @param nCommand
             describes which command has been invoked.
-            <br/>See <type scope="com::sun::star::awt">Command</type> for
+            <br/>See com::sun::star::awt::Command for
             possible values.
 
         @param bMouseEvent
diff --git a/offapi/com/sun/star/frame/XUIControllerFactory.idl b/offapi/com/sun/star/frame/XUIControllerFactory.idl
index 551a1a7a425d..cdae7b5ef8fc 100644
--- a/offapi/com/sun/star/frame/XUIControllerFactory.idl
+++ b/offapi/com/sun/star/frame/XUIControllerFactory.idl
@@ -42,20 +42,20 @@ interface XUIControllerFactory
     /** this interface provides functions to create new instances of a registered UI controller.
 
         <p>
-        Use <member scope="com::sun::star::lang">XMultiComponentFactory::createInstanceWithArgumentsAndContext()</member> to create
+        Use com::sun::star::lang::XMultiComponentFactory::createInstanceWithArgumentsAndContext() to create
         a new UI controller instance. Use the CommandURL as the service specifier.
 
         This call supports the following arguments provided as com::sun::star::beans::PropertyValue:
         <ul>
             <li>
-                <b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
+                <b>Frame</b><br>specifies the com::sun::star::frame::XFrame
                 instance to which the UI controller belongs to. This property must be provided to
                 the UI controller, otherwise it cannot dispatch its internal commands.
              </li>
             <li>
                 <b>ModuleIdentifier</b><br>optional string that specifies in which module context the UI
-                controller should be created.</br>The module identifier can be retrieved using the
-                <type>ModuleManager</type>.
+                controller should be created.<br>The module identifier can be retrieved using the
+                ModuleManager.
             </li>
         </ul>
         </p>