[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/source

[Jan Holesovsky]

 cui/source/dialogs/SpellDialog.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 40054ae87171ee4315ccc87761e198f0a2f64a34
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 18 21:42:13 2014 +0100

    spell dialog: Make [Close] work in protected documents with editable fields.
    
    We have to call ToggleChildWindow directly; calling SfxDispatcher's Execute()
    does not work here when we are in a document with protected section - in that
    case, the cursor can move from the editable field to the protected area, and
    the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
    FN_SPELL_GRAMMAR_DIALOG in .sdi).
    
    Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d
    Reviewed-on: https://gerrit.libreoffice.org/13531
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 96b59dc..745fbd0 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,9 +736,13 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 
 bool SpellDialog::Close()
 {
-    GetBindings().GetDispatcher()->
-        Execute(rParent.GetType(),
-        SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
+    // We have to call ToggleChildWindow directly; calling SfxDispatcher's
+    // Execute() does not work here when we are in a document with protected
+    // section - in that case, the cursor can move from the editable field to
+    // the protected area, and the slots get disabled because of
+    // SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+    SfxViewFrame::Current()->ToggleChildWindow(rParent.GetType());
+
     return true;
 }