From f252b332dd2652abb02851ba0c2521c045787801 Mon Sep 17 00:00:00 2001 From: Noel Grandin 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 --- .../android/examples/DocumentLoader.java | 6 +-- .../org/libreoffice/android/DocumentLoader.java | 6 +-- .../org/libreoffice/ui/LibreOfficeUIActivity.java | 6 +-- offapi/UnoApi_offapi.mk | 2 +- offapi/com/sun/star/awt/XToolkit2.idl | 50 ---------------------- offapi/com/sun/star/awt/XToolkitExperimental.idl | 50 ++++++++++++++++++++++ toolkit/inc/toolkit/awt/vclxtoolkit.hxx | 6 +-- toolkit/source/awt/vclxtoolkit.cxx | 2 +- touch/source/uno/Document.cxx | 6 +-- 9 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 offapi/com/sun/star/awt/XToolkit2.idl create mode 100644 offapi/com/sun/star/awt/XToolkitExperimental.idl 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/XToolkit2.idl deleted file mode 100644 index 1c5327c6c69f..000000000000 --- a/offapi/com/sun/star/awt/XToolkit2.idl +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Copyright 2012 LibreOffice contributors. - * - * 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/. - */ - -#ifndef __com_sun_star_awt_XToolkit2_idl__ -#define __com_sun_star_awt_XToolkit2_idl__ - -#include - -module com { module sun { module star { module awt { - -/** Work in progress, don't use unless you know what you are doing. - */ - -interface XToolkit2: XToolkit -{ - /** Create a bitmap device using a byte buffer allocated outside of UNO territory. - * - * @returns the device - * - * @param addressOfMemoryBufferForSharedArrayWrapper is the address of a - * (C++) object the exact type of which is to be determined, but the point - * is that it will then be rewrapped into a boost::shared_array of bytes to - * be passed to the basebmp code. shared_array has its own style of - * reference counting, naturally not related to UNO's or Java's, so lots of - * fun stuff to take care of. I won't bother complicating stuff with - * XUnoTunnel here (if it would even be possible to use it), this isn't in - * any way intended to be "generic" anyway, but is experimental work in - * progress, indented just for Android so far, and probably for iOS, too. - */ - - com::sun::star::awt::XDevice createScreenCompatibleDeviceUsingBuffer( [in] long Width, - [in] long Height, - [in] long ScaleNumerator, - [in] long ScaleDenominator, - [in] long XOffset, - [in] long YOffset, - [in] hyper AddressOfMemoryBufferForSharedArrayWrapper ); -}; - -}; }; }; }; - -#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 new file mode 100644 index 000000000000..c26d916af6b4 --- /dev/null +++ b/offapi/com/sun/star/awt/XToolkitExperimental.idl @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * 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/. + */ + +#ifndef __com_sun_star_awt_XToolkitExperimental_idl__ +#define __com_sun_star_awt_XToolkitExperimental_idl__ + +#include + +module com { module sun { module star { module awt { + +/** Work in progress, don't use unless you know what you are doing. + */ + +interface XToolkitExperimental: XToolkit +{ + /** Create a bitmap device using a byte buffer allocated outside of UNO territory. + * + * @returns the device + * + * @param addressOfMemoryBufferForSharedArrayWrapper is the address of a + * (C++) object the exact type of which is to be determined, but the point + * is that it will then be rewrapped into a boost::shared_array of bytes to + * be passed to the basebmp code. shared_array has its own style of + * reference counting, naturally not related to UNO's or Java's, so lots of + * fun stuff to take care of. I won't bother complicating stuff with + * XUnoTunnel here (if it would even be possible to use it), this isn't in + * any way intended to be "generic" anyway, but is experimental work in + * progress, indented just for Android so far, and probably for iOS, too. + */ + + com::sun::star::awt::XDevice createScreenCompatibleDeviceUsingBuffer( [in] long Width, + [in] long Height, + [in] long ScaleNumerator, + [in] long ScaleDenominator, + [in] long XOffset, + [in] long YOffset, + [in] hyper AddressOfMemoryBufferForSharedArrayWrapper ); +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 #include -#include +#include #include #include #include @@ -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 #include -#include +#include #include #include #include @@ -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(); } -- cgit