summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2020-03-22 11:45:08 -0400
committerMichael Meeks <michael.meeks@collabora.com>2020-05-16 19:45:33 +0100
commit4306eb8775e322c6ff0fd52f9b099723ac1a35a5 (patch)
treee5d23c213758634a8dd8db5118ab95a7b878e784
parent82f79a4158ef5a6796f622bb535f15a0615aa29e (diff)
sw: keep the cursor visible after creating SwDrawTextShell
For some mysterious reason the cursor was forced to become hidden after creating SwDrawTextShell, which is used to edit the text on shapes. Doing this didn't have a negative effect on desktop, because the cursor was shown anyway at a later point. However, for LOK, the cursor was not restored. This was unexpected as the clients didn't know editing was possible (and on mobile wouldn't even show the keyboard). There doesn't seem to be any ill-effect to leaving the cursor enabled in all cases after creating an SwDrawTextShell instance. Change-Id: Ifae8d533ef48b2146a451d58d729e46f5248be71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90897 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit a50d20b114b4d418cebb968af4b40645dfac087a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90947 Tested-by: Jenkins
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 674ed73378bf..9715313196e6 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -130,9 +130,9 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
SwWrtShell &rSh = GetShell();
SetPool(rSh.GetAttrPool().GetSecondaryPool());
+ // Initialize and show cursor to start editing.
Init();
- rSh.NoEdit();
SetName("ObjectText");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText));
}