fdo#46808, renamet awt::XToolkit2 to XToolkitExperimental..

..because we want to use the name for the new merged interface
for the Toolkit service.

Change-Id: Ib1e193c7d04729f6420ee6984231fd50181e59d3

android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java

@@ -92,7 +92,7 @@ import com.sun.star.awt.Size;
 import com.sun.star.awt.XBitmap;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XDevice;
-import com.sun.star.awt.XToolkit2;
+import com.sun.star.awt.XToolkitExperimental;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XController;
@@ -130,7 +130,7 @@ public class DocumentLoader
     XComponentContext context;
     XMultiComponentFactory mcf;
     XComponentLoader componentLoader;
-    XToolkit2 toolkit;
+    XToolkitExperimental toolkit;
     XDevice dummySmallDevice;
     Object doc;
     int pageCount;
@@ -822,7 +822,7 @@ public class DocumentLoader
 
                 Object toolkitService = mcf.createInstanceWithContext
                     ("com.sun.star.awt.Toolkit", context);
-                toolkit = (XToolkit2) UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
+                toolkit = (XToolkitExperimental) UnoRuntime.queryInterface(XToolkitExperimental.class, toolkitService);
 
                 renderable = (XRenderable) UnoRuntime.queryInterface(XRenderable.class, doc);
 

android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java

@@ -79,7 +79,7 @@ import com.sun.star.awt.Size;
 import com.sun.star.awt.XBitmap;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XDevice;
-import com.sun.star.awt.XToolkit2;
+import com.sun.star.awt.XToolkitExperimental;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XController;
@@ -121,7 +121,7 @@ public class DocumentLoader
     XComponentContext context;
     XMultiComponentFactory mcf;
     XComponentLoader componentLoader;
-    XToolkit2 toolkit;
+    XToolkitExperimental toolkit;
     XDevice dummySmallDevice;
     Object doc;
     int pageCount;
@@ -681,7 +681,7 @@ public class DocumentLoader
 
                 Object toolkitService = mcf.createInstanceWithContext
                     ("com.sun.star.awt.Toolkit", context);
-                toolkit = (XToolkit2) UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
+                toolkit = (XToolkitExperimental) UnoRuntime.queryInterface(XToolkitExperimental.class, toolkitService);
 
                 renderable = (XRenderable) UnoRuntime.queryInterface(XRenderable.class, doc);
 

android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java

@@ -64,7 +64,7 @@ import com.sun.star.awt.Size;
 import com.sun.star.awt.XBitmap;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XDevice;
-import com.sun.star.awt.XToolkit2;
+import com.sun.star.awt.XToolkitExperimental;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XController;
@@ -117,7 +117,7 @@ public class LibreOfficeUIActivity extends SherlockActivity implements ActionBar
     XComponentContext context;
     XMultiComponentFactory mcf;
     XComponentLoader componentLoader;
-    XToolkit2 toolkit;
+    XToolkitExperimental toolkit;
     XDevice dummySmallDevice;
     Object doc;
     int pageCount;
@@ -796,7 +796,7 @@ class ListItemAdapter implements ListAdapter{
 
                     Object toolkitService = mcf.createInstanceWithContext
                         ("com.sun.star.awt.Toolkit", context);
-                    toolkit = (XToolkit2) UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
+                    toolkit = (XToolkitExperimental) UnoRuntime.queryInterface(XToolkitExperimental.class, toolkitService);
 
                     renderable = (XRenderable) UnoRuntime.queryInterface(XRenderable.class, doc);
 		    if (renderable == null)

offapi/UnoApi_offapi.mk

@@ -1822,7 +1822,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
 	XTimeField \
 	XToggleButton \
 	XToolkit \
-	XToolkit2 \
+	XToolkitExperimental \
 	XTopWindow \
 	XTopWindow2 \
 	XTopWindowListener \

offapi/com/sun/star/awt/XToolkit2.idl → offapi/com/sun/star/awt/XToolkitExperimental.idl

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __com_sun_star_awt_XToolkit2_idl__
-#define __com_sun_star_awt_XToolkit2_idl__
+#ifndef __com_sun_star_awt_XToolkitExperimental_idl__
+#define __com_sun_star_awt_XToolkitExperimental_idl__
 
 #include <com/sun/star/awt/XToolkit.idl>
 
@@ -17,7 +17,7 @@ module com {  module sun {  module star {  module awt {
 /** Work in progress, don't use unless you know what you are doing.
  */
 
-interface XToolkit2: XToolkit
+interface XToolkitExperimental: XToolkit
 {
   /** Create a bitmap device using a byte buffer allocated outside of UNO territory.
    *

toolkit/inc/toolkit/awt/vclxtoolkit.hxx

@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/awt/XSystemChildFactory.hpp>
-#include <com/sun/star/awt/XToolkit2.hpp>
+#include <com/sun/star/awt/XToolkitExperimental.hpp>
 #include <com/sun/star/awt/XDataTransferProviderAccess.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
@@ -70,7 +70,7 @@ protected:
 
 class VCLXToolkit : public VCLXToolkit_Impl,
                     public cppu::WeakComponentImplHelper7<
-                    ::com::sun::star::awt::XToolkit2,
+                    ::com::sun::star::awt::XToolkitExperimental,
                     ::com::sun::star::lang::XServiceInfo,
                     ::com::sun::star::awt::XSystemChildFactory,
                     ::com::sun::star::awt::XMessageBoxFactory,
@@ -118,7 +118,7 @@ public:
     VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
     ~VCLXToolkit();
 
-    // ::com::sun::star::awt::XToolkit2
+    // ::com::sun::star::awt::XToolkitExperimental
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >      SAL_CALL createScreenCompatibleDeviceUsingBuffer( sal_Int32 Width, sal_Int32 Height, sal_Int32 ScaleNumerator, sal_Int32 ScaleDenominator, sal_Int32 XOffset, sal_Int32 YOffset, sal_Int64 AddressOfMemoryBufferForSharedArrayWrapper ) throw
 (::com::sun::star::uno::RuntimeException);
 

toolkit/source/awt/vclxtoolkit.cxx

@@ -464,7 +464,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
 // contructor, which might initialize VCL
 VCLXToolkit::VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ):
     cppu::WeakComponentImplHelper7<
-    ::com::sun::star::awt::XToolkit2,
+    ::com::sun::star::awt::XToolkitExperimental,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::awt::XSystemChildFactory,
     ::com::sun::star::awt::XMessageBoxFactory,

touch/source/uno/Document.cxx

@@ -11,7 +11,7 @@
 
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/awt/XToolkit2.hpp>
+#include <com/sun/star/awt/XToolkitExperimental.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -40,7 +40,7 @@ private:
     OUString m_sURI;
     uno::Reference< uno::XComponentContext > m_rContext;
     uno::Reference< lang::XComponent > m_xComponent;
-    uno::Reference< awt::XToolkit2 > m_xToolkit;
+    uno::Reference< awt::XToolkitExperimental > m_xToolkit;
     uno::Reference< frame::XController > m_xController;
 
     // XRenderable.getRendererCount() and .render() need an XController in the
@@ -162,7 +162,7 @@ public:
 
             m_xComponent = componentLoader->loadComponentFromURL( m_sURI, "_blank", 0, loadProps );
 
-            m_xToolkit = uno::Reference< awt::XToolkit2 >(  m_rContext->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.Toolkit2", m_rContext ), uno::UNO_QUERY_THROW );
+            m_xToolkit = uno::Reference< awt::XToolkitExperimental >(  m_rContext->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.ToolkitExperimental", m_rContext ), uno::UNO_QUERY_THROW );
 
             m_xController = new MyXController();
         }