[Libreoffice-commits] core.git: sw/source
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Tue Mar 24 00:37:54 UTC 2020
sw/source/uibase/shells/drwtxtsh.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3db34e18a5b5133815ea2ec7fd12651cf738c538
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Mar 22 11:45:08 2020 -0400
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Tue Mar 24 01:37:14 2020 +0100
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 at gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit a50d20b114b4d418cebb968af4b40645dfac087a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90947
Tested-by: Jenkins
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 23e4728f6a5a..5763afd54c47 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -120,9 +120,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));
}
More information about the Libreoffice-commits
mailing list