diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-12-18 11:11:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-12-18 12:00:40 +0200 |
| commit | 58bec49af36c3e7554bf20664ac15c45b1ce88c4 (patch) | |
| tree | fc6a7b875ff7223ded284b4f8f0bde87137d7c6e /toolkit | |
| parent | bcb4f01de2d6f6a9d06ca7dfd14fa80e725f5a81 (diff) | |
Kill createScreenCompatibleDeviceUsingBuffer
A certain 3rd party uses processEventsToIdle() from XToolkitExperimental, and
their code is not C++, so it should be OK to change the ABI of
XToolkitExperimental, says mmeeks.
Change-Id: I4ba641ad98c17ae42a2ae2eff389fd3354618597
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 680fc0caa04b..38b550270d6b 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -64,11 +64,6 @@ #include "postmac.h" #endif -#ifdef ANDROID -#include <sal/ByteBufferWrapper.hxx> -using org::libreoffice::touch::ByteBufferWrapper; -#endif - #include <vcl/sysdata.hxx> #include <toolkit/awt/vclxwindows.hxx> @@ -195,8 +190,6 @@ public: virtual ~VCLXToolkit(); // css::awt::XToolkitExperimental - css::uno::Reference< css::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 -(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processEventsToIdle() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -730,11 +723,6 @@ void SAL_CALL VCLXToolkit::disposing() ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - return createScreenCompatibleDeviceUsingBuffer( Width, Height, 1, 1, 0, 0, 0 ); -} - -::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXToolkit::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, std::exception) -{ ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > xRef; @@ -743,18 +731,7 @@ void SAL_CALL VCLXToolkit::disposing() SolarMutexGuard aSolarGuard; VirtualDevice* pV = new VirtualDevice; - if ( addressOfMemoryBufferForSharedArrayWrapper != 0 ) { -#if defined(ANDROID) - ByteBufferWrapper *bbw = (ByteBufferWrapper *) (intptr_t) addressOfMemoryBufferForSharedArrayWrapper; - pV->SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ), Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, YOffset), basebmp::RawMemorySharedArray( bbw->pointer(), *bbw )); -#else - pV->SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ), - Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, YOffset), - basebmp::RawMemorySharedArray( reinterpret_cast<sal_uInt8*>( addressOfMemoryBufferForSharedArrayWrapper ))); -#endif - } else { - pV->SetOutputSizePixel( Size( Width, Height ) ); - } + pV->SetOutputSizePixel( Size( Width, Height ) ); pVDev->SetVirtualDevice( pV ); xRef = pVDev; |