mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SwSelPaintRects: avoid rendering the overlay on Android

Browse Source 
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
This commit is contained in:
Miklos Vajna
2015-04-02 12:14:16 +02:00
parent 6218409072
commit 03ee279354
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sw/source/core/crsr/viscrs.cxx
View File

@@ -290,7 +290,7 @@ void SwSelPaintRects::Show()
SwRects::clear(); SwRects::clear();
FillRects(); FillRects();
#if HAVE_FEATURE_DESKTOP || defined(ANDROID) #if HAVE_FEATURE_DESKTOP
// get new rects // get new rects
std::vector< basegfx::B2DRange > aNewRanges; 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 // 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, // 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 // 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(); OString sRect = ss.str().c_str();
GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr()); GetShell()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr());
} }
HighlightInputFld();
#endif
} }
} }