Kaydet (Commit) 57697340 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Miklos Vajna

Don't hide cursor for Android anymore - makes cursor events work

Change-Id: I97caadf079c9a5e38c00c80fdc8185aee997f632
üst 9288a3c6
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#include <comcore.hrc> #include <comcore.hrc>
#include <IDocumentLayoutAccess.hxx> #include <IDocumentLayoutAccess.hxx>
#if defined(ANDROID) || defined(IOS) #if defined(IOS)
#include <touch/touch.h> #include <touch/touch.h>
#endif #endif
...@@ -2119,7 +2119,7 @@ void SwCrsrShell::ShowCrsr() ...@@ -2119,7 +2119,7 @@ void SwCrsrShell::ShowCrsr()
{ {
m_bSVCrsrVis = true; m_bSVCrsrVis = true;
m_pCurCrsr->SetShowTxtInputFldOverlay( true ); m_pCurCrsr->SetShowTxtInputFldOverlay( true );
#if defined(ANDROID) || defined(IOS) #if defined(IOS)
// This was dummied out both for Android and for TiledLibreOffice (iOS) anyway // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway
// touch_ui_show_keyboard(); // touch_ui_show_keyboard();
#endif #endif
...@@ -2136,7 +2136,7 @@ void SwCrsrShell::HideCrsr() ...@@ -2136,7 +2136,7 @@ void SwCrsrShell::HideCrsr()
SET_CURR_SHELL( this ); SET_CURR_SHELL( this );
m_pCurCrsr->SetShowTxtInputFldOverlay( false ); m_pCurCrsr->SetShowTxtInputFldOverlay( false );
m_pVisCrsr->Hide(); m_pVisCrsr->Hide();
#if defined(ANDROID) || defined(IOS) #if defined(IOS)
// This was dummied out both for Android and for TiledLibreOffice (iOS) anyway // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway
// touch_ui_hide_keyboard(); // touch_ui_hide_keyboard();
#endif #endif
...@@ -2634,7 +2634,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin ) ...@@ -2634,7 +2634,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
m_pVisCrsr = new SwVisCrsr( this ); m_pVisCrsr = new SwVisCrsr( this );
m_bMacroExecAllowed = rShell.IsMacroExecAllowed(); m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
#if defined(ANDROID) || defined(IOS) #if defined(IOS)
HideCrsr(); HideCrsr();
#endif #endif
} }
...@@ -2685,7 +2685,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin, ...@@ -2685,7 +2685,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
m_pVisCrsr = new SwVisCrsr( this ); m_pVisCrsr = new SwVisCrsr( this );
m_bMacroExecAllowed = true; m_bMacroExecAllowed = true;
#if defined(ANDROID) || defined(IOS) #if defined(IOS)
HideCrsr(); HideCrsr();
#endif #endif
} }
......
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