summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-02 12:14:16 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-07 09:18:12 +0200
commit03ee2793543d7db25847c5263d88b0eb0d7e8f28 (patch)
treedfed3c3bd69368c19a8d5df9d8427b58eef9f415 /sw
parent6218409072c5a7c59b3be8af4dccb3a808ffad54 (diff)
SwSelPaintRects: avoid rendering the overlay on Android
It's enough to emit the LOK callbacks, no need to waste resources with the drawinglayer overlay that would not be shown anyway. As a side-effect, this also fixes a crash on long push on empty table cells. Change-Id: I28e670d91bafcbfac93655a7d161f03670a54cfc
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/viscrs.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 89962ec38276..11ef0f5effc0 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -290,7 +290,7 @@ void SwSelPaintRects::Show()
SwRects::clear();
FillRects();
-#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
+#if HAVE_FEATURE_DESKTOP
// get new rects
std::vector< basegfx::B2DRange > aNewRanges;
@@ -338,6 +338,9 @@ void SwSelPaintRects::Show()
}
}
+ HighlightInputFld();
+#endif
+
// Tiled editing does not expose the draw and writer cursor, it just
// talks about "the" cursor at the moment. As long as that's true,
// don't say anything about the Writer cursor till a draw object is
@@ -378,9 +381,6 @@ void SwSelPaintRects::Show()
OString sRect = ss.str().c_str();
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr());
}
-
- HighlightInputFld();
-#endif
}
}