summaryrefslogtreecommitdiff
path: root/sw/source/core/crsr/crsrsh.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-01-29 18:07:06 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-09 08:12:06 +0100
commit576973408d88c9bf6100c09cb10b84edcdc88094 (patch)
tree1977ab9802201eec8a38b8162726583bff8643fc /sw/source/core/crsr/crsrsh.cxx
parent9288a3c6b0d07a763a227e8fd97d0ece0eee96b9 (diff)
Don't hide cursor for Android anymore - makes cursor events work
Change-Id: I97caadf079c9a5e38c00c80fdc8185aee997f632
Diffstat (limited to 'sw/source/core/crsr/crsrsh.cxx')
-rw-r--r--sw/source/core/crsr/crsrsh.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a8cd152dcfb0..982a2ac99bbb 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -63,7 +63,7 @@
#include <comcore.hrc>
#include <IDocumentLayoutAccess.hxx>
-#if defined(ANDROID) || defined(IOS)
+#if defined(IOS)
#include <touch/touch.h>
#endif
@@ -2119,7 +2119,7 @@ void SwCrsrShell::ShowCrsr()
{
m_bSVCrsrVis = 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
// touch_ui_show_keyboard();
#endif
@@ -2136,7 +2136,7 @@ void SwCrsrShell::HideCrsr()
SET_CURR_SHELL( this );
m_pCurCrsr->SetShowTxtInputFldOverlay( false );
m_pVisCrsr->Hide();
-#if defined(ANDROID) || defined(IOS)
+#if defined(IOS)
// This was dummied out both for Android and for TiledLibreOffice (iOS) anyway
// touch_ui_hide_keyboard();
#endif
@@ -2634,7 +2634,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
m_pVisCrsr = new SwVisCrsr( this );
m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
-#if defined(ANDROID) || defined(IOS)
+#if defined(IOS)
HideCrsr();
#endif
}
@@ -2685,7 +2685,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
m_pVisCrsr = new SwVisCrsr( this );
m_bMacroExecAllowed = true;
-#if defined(ANDROID) || defined(IOS)
+#if defined(IOS)
HideCrsr();
#endif
}