sw/source/core/crsr/viscrs.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 085ed0cfa7a831326d308c501db8a2d76a947016
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Apr 2 12:14:16 2015 +0200
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
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 89962ec..11ef0f5 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
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
