From f252b332dd2652abb02851ba0c2521c045787801 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 16 Oct 2012 15:45:22 +0200
Subject: 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
---
 .../src/org/libreoffice/android/examples/DocumentLoader.java        | 6 +++---
 .../src/org/libreoffice/android/DocumentLoader.java                 | 6 +++---
 .../src/org/libreoffice/ui/LibreOfficeUIActivity.java               | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'android')

diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 841b3418efe8..8c9a71374196 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/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);
 
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 601e583268d7..ea410512d20a 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ b/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);
 
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index d47d25599066..029db572d5a5 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/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)
-- 
cgit