summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java6
-rw-r--r--android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java6
-rw-r--r--android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java6
-rw-r--r--offapi/UnoApi_offapi.mk2
-rw-r--r--offapi/com/sun/star/awt/XToolkitExperimental.idl (renamed from offapi/com/sun/star/awt/XToolkit2.idl)6
-rw-r--r--toolkit/inc/toolkit/awt/vclxtoolkit.hxx6
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
-rw-r--r--touch/source/uno/Document.cxx6
8 files changed, 20 insertions, 20 deletions
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)
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7b99858f9da8..b248cf33c8a3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/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 \
diff --git a/offapi/com/sun/star/awt/XToolkit2.idl b/offapi/com/sun/star/awt/XToolkitExperimental.idl
index 1c5327c6c69f..c26d916af6b4 100644
--- a/offapi/com/sun/star/awt/XToolkit2.idl
+++ b/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.
*
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
index 3423066cf815..d8bd1c91878c 100644
--- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
+++ b/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);
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 4ee90412da7a..173d23cfbadf 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/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,
diff --git a/touch/source/uno/Document.cxx b/touch/source/uno/Document.cxx
index 506e4e55f12a..0acb9031d775 100644
--- a/touch/source/uno/Document.cxx
+++ b/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();
}
generated by cgit (git 2.34.1) at 2025-02-10 02:41:03 +0000