[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
Eike Rathke
erack at redhat.com
Wed Mar 6 00:57:22 PST 2013
sc/source/ui/app/inputhdl.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 52aaf74783aee2866d9768a917007688bc68bc1f
Author: Eike Rathke <erack at redhat.com>
Date: Mon Mar 4 19:32:42 2013 +0100
resolved rhbz#916936 allow also input line for read-only
Allow activation of input line and cell activation in read-only
documents regardless whether it's part of an array or not.
Change-Id: Id2dc9de9e60b58f4b471fb232e899c9ea75e83f1
(cherry picked from commit 9c51646541846317777b00dc6ad2e30cb1c07950)
Reviewed-on: https://gerrit.libreoffice.org/2546
Reviewed-by: Muthu Subramanian K <muthusuba at gmail.com>
Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
Tested-by: Miklos Vajna <vmiklos at suse.cz>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 6938e0d..11cca6d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1950,10 +1950,12 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
if (!aTester.IsEditable())
{
bProtected = true;
- // We allow read-only input mode activation when explicit cell
- // activation is requested (double-click or F2) and if it's not
- // part of an array.
- bool bShowError = !bInputActivated || aTester.GetMessageId() != STR_PROTECTIONERR;
+ // We allow read-only input mode activation regardless
+ // whether it's part of an array or not or whether explicit cell
+ // activation is requested (double-click or F2) or a click in input
+ // line.
+ bool bShowError = (!bInputActivated || aTester.GetMessageId() != STR_PROTECTIONERR) &&
+ !pActiveViewSh->GetViewData()->GetDocShell()->IsReadOnly();
if (bShowError)
{
eMode = SC_INPUT_NONE;
More information about the Libreoffice-commits
mailing list