fdo#46808, Adapt awt::Toolkit UNO service to new style

Create a merged XToolkit2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Also mark sub-interfaces as non-optional.

Change-Id: I278d0288e92be277033013302267cf93f7d70480

5 files changed, 65 insertions, 20 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b248cf33c8a3..c590daca339d 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
 	MenuBar \
 	PopupMenu \
 	TabController \
+	Toolkit \
 	UnoControlDialogModelProvider \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
@@ -374,7 +375,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
 	RoadmapItem \
 	SpinningProgressControlModel \
 	TabControllerModel \
-	Toolkit \
 	UnoControl \
 	UnoControlButton \
 	UnoControlButtonModel \
@@ -1822,6 +1822,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
 	XTimeField \
 	XToggleButton \
 	XToolkit \
+	XToolkit2 \
 	XToolkitExperimental \
 	XTopWindow \
 	XTopWindow2 \
diff --git a/offapi/com/sun/star/awt/Toolkit.idl b/offapi/com/sun/star/awt/Toolkit.idl
index 20cf21dfa7fa..2290688c4672 100644
--- a/offapi/com/sun/star/awt/Toolkit.idl
+++ b/offapi/com/sun/star/awt/Toolkit.idl
@@ -19,16 +19,11 @@
 #ifndef __com_sun_star_awt_Toolkit_idl__
 #define __com_sun_star_awt_Toolkit_idl__
 
-#include <com/sun/star/awt/XToolkit.idl>
-#include <com/sun/star/awt/XDataTransferProviderAccess.idl>
-#include <com/sun/star/awt/XSystemChildFactory.idl>
-#include <com/sun/star/awt/XMessageBoxFactory.idl>
-
+#include <com/sun/star/awt/XToolkit2.idl>
 
 
 module com {  module sun {  module star {  module awt {
 
-
 /** describes a toolkit that creates windows on a screen.
 
     <p>The design of the interfaces for the toolkit implementation
@@ -36,17 +31,7 @@ module com {  module sun {  module star {  module awt {
     of the toolkit should be one-way. Too many synchronous calls kill the
     remote performance.</p>
  */
-published service Toolkit
-{
-    interface XToolkit;
-
-    [optional] interface com::sun::star::awt::XDataTransferProviderAccess;
-
-    [optional] interface com::sun::star::awt::XSystemChildFactory;
-
-    [optional] interface com::sun::star::awt::XMessageBoxFactory;
-
-};
+published service Toolkit : XToolkit2;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/awt/XToolkit2.idl b/offapi/com/sun/star/awt/XToolkit2.idl
new file mode 100644
index 000000000000..2d40d9c6021f
--- /dev/null
+++ b/offapi/com/sun/star/awt/XToolkit2.idl
@@ -0,0 +1,59 @@
+/* -*- 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_awt_XToolkit2_idl__
+#define __com_sun_star_awt_XToolkit2_idl__
+
+#include <com/sun/star/awt/XToolkit.idl>
+#include <com/sun/star/awt/XDataTransferProviderAccess.idl>
+#include <com/sun/star/awt/XSystemChildFactory.idl>
+#include <com/sun/star/awt/XMessageBoxFactory.idl>
+#include <com/sun/star/awt/XExtendedToolkit.idl>
+#include <com/sun/star/awt/XReschedule.idl>
+
+
+
+module com {  module sun {  module star {  module awt {
+
+
+/**
+  Provides a unified interface for the new-style service Toolkit to implement.
+
+  @since LibreOffice 3.7
+ */
+published interface XToolkit2
+{
+    interface XToolkit;
+
+    interface com::sun::star::awt::XDataTransferProviderAccess;
+
+    interface com::sun::star::awt::XSystemChildFactory;
+
+    interface com::sun::star::awt::XMessageBoxFactory;
+
+    interface com::sun::star::awt::XExtendedToolkit;
+
+    interface com::sun::star::awt::XReschedule;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/awt/XToolkitExperimental.idl b/offapi/com/sun/star/awt/XToolkitExperimental.idl
index c26d916af6b4..a60b3bc7510f 100644
--- a/offapi/com/sun/star/awt/XToolkitExperimental.idl
+++ b/offapi/com/sun/star/awt/XToolkitExperimental.idl
@@ -10,14 +10,14 @@
 #ifndef __com_sun_star_awt_XToolkitExperimental_idl__
 #define __com_sun_star_awt_XToolkitExperimental_idl__
 
-#include <com/sun/star/awt/XToolkit.idl>
+#include <com/sun/star/awt/XToolkit2.idl>
 
 module com {  module sun {  module star {  module awt {
 
 /** Work in progress, don't use unless you know what you are doing.
  */
 
-interface XToolkitExperimental: XToolkit
+interface XToolkitExperimental : XToolkit2
 {
   /** Create a bitmap device using a byte buffer allocated outside of UNO territory.
    *
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 34d7172536e8..da0750a56458 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb