diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-28 19:01:19 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-28 19:01:19 +0200 |
| commit | 49564323e25d742ef11a9c93f5d7324459fdb95d (patch) | |
| tree | 386a0ca2988f65c7b21a3ffefd00e3b071cf82f5 | |
| parent | 1047b426ed7ab0ee7a1b3ecf01adab18eb040de2 (diff) | |
Fix SalUserEventList usage on Android
Change-Id: I598446c6f14e9df798bf37cb64c8b7bcbb04dd91
| -rw-r--r-- | vcl/android/androidinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/headless/svpinst.cxx | 12 | ||||
| -rw-r--r-- | vcl/inc/headless/svpinst.hxx | 4 |
3 files changed, 1 insertions, 17 deletions
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(); |