vcl/android/androidinst.cxx | 2 +-
vcl/headless/svpinst.cxx | 12 ------------
vcl/inc/headless/svpinst.hxx | 4 ----
3 files changed, 1 insertion(+), 17 deletions(-)
New commits:
commit 49564323e25d742ef11a9c93f5d7324459fdb95d
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Sep 28 19:01:19 2017 +0200
Fix SalUserEventList usage on Android
Change-Id: I598446c6f14e9df798bf37cb64c8b7bcbb04dd91
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index f74f3e0d35ef..3c181ace2ff6 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -73,7 +73,7 @@ bool AndroidSalInstance::AnyInput( VclInputFlags nType )
// Unfortunately there is no way to check for a specific type of
// input being queued. That information is too hidden, sigh.
- return SvpSalInstance::s_pDefaultInstance->PostedEventsInQueue();
+ return SvpSalInstance::s_pDefaultInstance->HasUserEvents();
}
class AndroidSalSystem : public SvpSalSystem {
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 5153c8952f4a..44df78a7df60 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -157,18 +157,6 @@ void SvpSalInstance::TriggerUserEventProcessing()
Wakeup();
}
-#ifdef ANDROID
-bool SvpSalInstance::PostedEventsInQueue()
-{
- bool result = false;
- {
- osl::MutexGuard g(m_aEventGuard);
- result = !m_aUserEvents.empty();
- }
- return result;
-}
-#endif
-
void SvpSalInstance::Wakeup()
{
#ifndef IOS
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 80566be18248..ba80960326dc 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -79,10 +79,6 @@ public:
void CloseWakeupPipe(bool log);
void CreateWakeupPipe(bool log);
-#ifdef ANDROID
- bool PostedEventsInQueue();
-#endif
-
void StartTimer( sal_uLong nMS );
void StopTimer();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
