diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 22:25:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-01 17:52:18 +0000 |
| commit | 74ac2c25a71d820ce187282be6d66f4b66da5b18 (patch) | |
| tree | 73d530a5dbb82e8a2277e4edd1bcf0a7f082b6b8 /vcl/android | |
| parent | 2387d277f7c717f9f4035235f71f15f5ccdc9751 (diff) | |
work around lack of cairo_rectangle_int_t with basegfx
ditch the CAIRO_VERSION_ENCODE(1, 10, 0) + sub optional
damage rect and just use our always-available basegfx
foo here.
Change-Id: I680453180f4725ac37cabf38d71b935c99edf6c7
Reviewed-on: https://gerrit.libreoffice.org/21971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/android')
| -rw-r--r-- | vcl/android/androidinst.cxx | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index b39face75806..99f4c507f4dc 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -37,26 +37,6 @@ public: virtual bool ErrorTrapPop( bool ) { return false; } }; -void AndroidSalInstance::damaged(AndroidSalFrame* /* frame */) -{ - static bool beenHere = false; - static jmethodID nCallbackDamaged = 0; - - // Check if we are running in an app that has registered for damage callbacks - // static public void callbackDamaged(); - // Call the Java layer to post an invalidate if necessary - - if (appClass != 0 && !beenHere) { - nCallbackDamaged = m_pJNIEnv->GetStaticMethodID(appClass, "callbackDamaged", "()V"); - if (nCallbackDamaged == 0) - LOGE("Could not find the callbackDamaged method"); - beenHere = true; - } - - if (appClass != 0 && nCallbackDamaged != 0) - m_pJNIEnv->CallStaticVoidMethod(appClass, nCallbackDamaged); -} - void AndroidSalInstance::GetWorkArea( Rectangle& rRect ) { rRect = Rectangle( Point( 0, 0 ), @@ -131,16 +111,6 @@ public: AndroidSalInstance::getInstance()->GetWorkArea( rRect ); } - virtual void damaged( const basegfx::B2IBox& rDamageRect) - { - if (rDamageRect.getWidth() <= 0 || - rDamageRect.getHeight() <= 0) - { - return; - } - AndroidSalInstance::getInstance()->damaged( this ); - } - virtual void UpdateSettings( AllSettings &rSettings ) { // Clobber the UI fonts |