fdo#46808, Convert FrameLoaderFactory and ContentHandlerFactory to new style

by creating a common service interface for them to implement

Change-Id: Icec85c55ed0ac13a6c785fdad6b0cd9c11878ba5

5 files changed, 93 insertions, 97 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index fc572896fe0f..4c1e9974d0b9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -189,12 +189,14 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
 	AutoRecovery \
 	AppDispatchProvider \
 	Bibliography \
+	ContentHandlerFactory \
 	Desktop \
 	DispatchHelper \
 	DispatchRecorder \
 	DispatchRecorderSupplier \
 	DocumentTemplates \
 	Frame \
+	FrameLoaderFactory \
 	GlobalEventBroadcaster \
 	LayoutManager \
 	MediaTypeDetectionHelper \
@@ -935,14 +937,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
 	Components \
 	ContentHandler \
-	ContentHandlerFactory \
 	Controller \
 	DesktopTask \
 	DesktopTasks \
 	DispatchProvider \
 	FrameControl \
 	FrameLoader \
-	FrameLoaderFactory \
 	FramesContainer \
 	PopupMenuController \
 	PopupMenuControllerFactory \
@@ -2607,6 +2607,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	XLayoutManagerListener \
 	XLoadEventListener \
 	XLoadable \
+	XLoaderFactory \
 	XMenuBarAcceptor \
 	XMenuBarMergingAcceptor \
 	XModel \
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index 4702ed3a022b..e3411714b862 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -19,9 +19,7 @@
 #ifndef __com_sun_star_frame_ContentHandlerFactory_idl__
 #define __com_sun_star_frame_ContentHandlerFactory_idl__
 
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#include <com/sun/star/container/XNameAccess.idl>
-#include <com/sun/star/container/XContainerQuery.idl>
+#include <com/sun/star/frame/XLoaderFactory.idl>
 
 
 module com { module sun { module star { module frame {
@@ -37,51 +35,7 @@ module com { module sun { module star { module frame {
     </ul>
     </p>
  */
-published service ContentHandlerFactory
-{
-    /** interface to create handler objects by using his internal name
-
-        <p>
-        Returned objects must support the service specification of a <type>ContentHandler</type>.
-        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
-        the flat configuration.
-        </p>
-    */
-    interface com::sun::star::lang::XMultiServiceFactory;
-
-    /** provides access to the whole content handler configuration
-
-        <p>
-        This interface supports an access to the internal configuration
-        of all accessible handler objects. The return value of
-        <member scope="com::sun::star::container">XNameAccess::getByName()</member> is a property sequence
-        packed in an any.
-        </p>
-        <table border=1>
-            <tr>
-                <td><b>Types<b></td>
-                <td>[string]</td>
-                <td>file types for which handler is registered</td>
-            </tr>
-            <tr>
-                <td><b>UIName<b></td>
-                <td>[string]</td>
-                <td>UI representable and localized name</td>
-            </tr>
-        </table>
-    */
-    interface com::sun::star::container::XNameAccess;
-
-    /** supports query mode for configuration access
-
-        <p>
-        This interface can be used to get sub sets of current configuration entries
-        which represent given search parameters.
-        </p>
-     */
-    interface com::sun::star::container::XContainerQuery;
-};
+published service ContentHandlerFactory : XLoaderFactory;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index 3a095b6f6950..6efe90694baf 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -19,9 +19,7 @@
 #ifndef __com_sun_star_frame_FrameLoaderFactory_idl__
 #define __com_sun_star_frame_FrameLoaderFactory_idl__
 
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#include <com/sun/star/container/XNameAccess.idl>
-#include <com/sun/star/container/XContainerQuery.idl>
+#include <com/sun/star/frame/XLoaderFactory.idl>
 
 
 module com { module sun { module star { module frame {
@@ -37,50 +35,7 @@ module com { module sun { module star { module frame {
     </ul>
     </p>
  */
-published service FrameLoaderFactory
-{
-    /** 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
-        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
-        the flat configuration.
-        </p>
-    */
-    interface com::sun::star::lang::XMultiServiceFactory;
-
-    /** 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>
-        <table border=1>
-            <tr>
-                <td><b>Types<b></td>
-                <td>[string]</td>
-                <td>file types which loader is registered for</td>
-            </tr>
-            <tr>
-                <td><b>UIName<b></td>
-                <td>[string]</td>
-                <td>UI representable and localized name</td>
-            </tr>
-        </table>
-    */
-    interface com::sun::star::container::XNameAccess;
-
-    /** supports query mode for configuration access
-
-        <p>
-        This interface can be used to get sub sets of current configuration entries
-        which represent given search parameters.
-        </p>
-     */
-    interface com::sun::star::container::XContainerQuery;
-};
+published service FrameLoaderFactory : XLoaderFactory;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/frame/XLoaderFactory.idl b/offapi/com/sun/star/frame/XLoaderFactory.idl
new file mode 100644
index 000000000000..31248418e029
--- /dev/null
+++ b/offapi/com/sun/star/frame/XLoaderFactory.idl
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_frame_XLoaderFactory_idl__
+#define __com_sun_star_frame_XLoaderFactory_idl__
+
+#include <com/sun/star/container/XContainerQuery.idl>
+#include <com/sun/star/container/XNameAccess.idl>
+#include <com/sun/star/lang/XMultiServiceFactory.idl>
+
+
+
+ module com {  module sun {  module star {  module frame {
+
+/**
+    Unified service interface for FrameLoaderFactory and ContentHandlerFactory.
+
+    @since LibreOffice 4.2
+ */
+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
+        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
+        the flat configuration.
+        </p>
+    */
+    interface com::sun::star::lang::XMultiServiceFactory;
+
+    /** 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>
+        <table border=1>
+            <tr>
+                <td><b>Types<b></td>
+                <td>[string]</td>
+                <td>file types which loader is registered for</td>
+            </tr>
+            <tr>
+                <td><b>UIName<b></td>
+                <td>[string]</td>
+                <td>UI representable and localized name</td>
+            </tr>
+        </table>
+    */
+    interface com::sun::star::container::XNameAccess;
+
+    /** supports query mode for configuration access
+
+        <p>
+        This interface can be used to get sub sets of current configuration entries
+        which represent given search parameters.
+        </p>
+     */
+    interface com::sun::star::container::XContainerQuery;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb
index 88226211f543..33c46854a483 100644
--- a/offapi/type_reference/offapi.rdb
+++ b/offapi/type_reference/offapi.rdb