Kaydet (Commit) 58bec49a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst bcb4f01d
...@@ -19,17 +19,6 @@ module com { module sun { module star { module awt { ...@@ -19,17 +19,6 @@ module com { module sun { module star { module awt {
interface XToolkitExperimental : XToolkit2 interface XToolkitExperimental : XToolkit2
{ {
/** Don't use this.
*/
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 );
/** Process all pending idle events /** Process all pending idle events
*/ */
void processEventsToIdle(); void processEventsToIdle();
......
...@@ -64,11 +64,6 @@ ...@@ -64,11 +64,6 @@
#include "postmac.h" #include "postmac.h"
#endif #endif
#ifdef ANDROID
#include <sal/ByteBufferWrapper.hxx>
using org::libreoffice::touch::ByteBufferWrapper;
#endif
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <toolkit/awt/vclxwindows.hxx> #include <toolkit/awt/vclxwindows.hxx>
...@@ -195,8 +190,6 @@ public: ...@@ -195,8 +190,6 @@ public:
virtual ~VCLXToolkit(); virtual ~VCLXToolkit();
// css::awt::XToolkitExperimental // 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() virtual void SAL_CALL processEventsToIdle()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
...@@ -729,11 +722,6 @@ void SAL_CALL VCLXToolkit::disposing() ...@@ -729,11 +722,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) ::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() ); ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
...@@ -743,18 +731,7 @@ void SAL_CALL VCLXToolkit::disposing() ...@@ -743,18 +731,7 @@ void SAL_CALL VCLXToolkit::disposing()
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
VirtualDevice* pV = new VirtualDevice; VirtualDevice* pV = new VirtualDevice;
if ( addressOfMemoryBufferForSharedArrayWrapper != 0 ) { pV->SetOutputSizePixel( Size( Width, Height ) );
#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 ) );
}
pVDev->SetVirtualDevice( pV ); pVDev->SetVirtualDevice( pV );
xRef = pVDev; xRef = pVDev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment