fdo#46808, Convert frame::FrameControl service to new style

Change-Id: I38fc91e70d99472a4336250acd5c7dc3457b21ab

4 files changed, 69 insertions, 23 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 174c03b1adb2..592f1b910780 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -199,6 +199,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
 	DispatchRecorderSupplier \
 	DocumentTemplates \
 	Frame \
+	FrameControl \
 	FrameLoaderFactory \
 	GlobalEventBroadcaster \
 	LayoutManager \
@@ -942,7 +943,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
 	DesktopTask \
 	DesktopTasks \
 	DispatchProvider \
-	FrameControl \
 	FrameLoader \
 	FramesContainer \
 	PopupMenuController \
@@ -2586,6 +2586,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	XFrame \
 	XFrame2 \
 	XFrameActionListener \
+	XFrameControl \
 	XFrameLoader \
 	XFrameLoaderQuery \
 	XFrameSetModel \
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index 7a85e6d7f9ec..692d2395dbe9 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -19,8 +19,7 @@
 #ifndef __com_sun_star_frame_FrameControl_idl__
 #define __com_sun_star_frame_FrameControl_idl__
 
-#include <com/sun/star/awt/UnoControl.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/frame/XFrameControl.idl>
 
 
  module com {  module sun {  module star {  module frame {
@@ -34,26 +33,7 @@
     any UI.
     </p>
  */
-published service FrameControl
-{
-    /** the base service of all controls
-     */
-    service com::sun::star::awt::UnoControl;
-
-    /** contains the type of the component which is loaded into the frame,
-        or the document which implicitly specifies the type
-     */
-    [property] string ComponentUrl;
-
-    /** the frame held by this control
-
-        <p>
-        The Frame is created if the control
-        is shown and the #ComponentUrl is set.
-        </p>
-     */
-    [property, readonly] string Frame;
-};
+published service FrameControl : XFrameControl;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/frame/XFrameControl.idl b/offapi/com/sun/star/frame/XFrameControl.idl
new file mode 100644
index 000000000000..0375f344bc28
--- /dev/null
+++ b/offapi/com/sun/star/frame/XFrameControl.idl
@@ -0,0 +1,65 @@
+/* -*- 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_XFrameControl_idl__
+#define __com_sun_star_frame_XFrameControl_idl__
+
+#include <com/sun/star/awt/UnoControl.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/beans/PropertyValue.idl>
+#include <com/sun/star/frame/XFrame2.idl>
+
+
+ module com {  module sun {  module star {  module frame {
+
+/**
+    Unified interface for the FrameControl service.
+    This is not the complete set of interfaces this service implements, just the bare minimum
+    that we use internally.
+
+    @since LibreOffice 4.2
+ */
+published interface XFrameControl
+{
+    interface com::sun::star::awt::XControl;
+
+    interface com::sun::star::awt::XWindow;
+
+    /** contains the type of the component which is loaded into the frame,
+        or the document which implicitly specifies the type
+     */
+    [attribute] string ComponentURL;
+
+    /** the frame held by this control
+
+        <p>
+        The Frame is created if the control
+        is shown and the #ComponentUrl is set.
+        </p>
+     */
+    [attribute] com::sun::star::frame::XFrame2 Frame;
+
+    [attribute] sequence< ::com::sun::star::beans::PropertyValue > LoaderArguments;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb
index fd83b2292aa3..667b727f7f44 100644
--- a/offapi/type_reference/offapi.rdb
+++ b/offapi/type_reference/offapi.rdb