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

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 38e7b2db19b85088cdf98dc1a8080e54f92c8714
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 1 10:28:58 2017 +0000

    Resolves: tdf#100438 focus trapped in disabled toolbar
    
    lets just leave the toolbar active the whole time, seems
    to make more sense anyway wrt being allowed to keyboard
    into it to paste/insert special character
    
    Change-Id: I174fb707c4c7fd21d95461cc93323eb6d8970818
    (cherry picked from commit 4bd53cd880ecfa9af27735344bf57fb45de20c25)
    Reviewed-on: https://gerrit.libreoffice.org/33785
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index e0bdeb0..a4e83e5 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -436,7 +436,6 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
  */
 IMPL_LINK_NOARG( SpellDialog, InitHdl, void*, void)
 {
-    m_pToolbar->Disable();
     SetUpdateMode( false );
     //show or hide AutoCorrect depending on the modules abilities
     m_pAutoCorrPB->Show(rParent.HasAutoCorrection());
@@ -1523,14 +1522,6 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
         else
             bChange = false;
     }
-    else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS && m_xToolbar)
-    {
-        m_xToolbar->Enable();
-    }
-    else if(rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && m_xToolbar)
-    {
-        m_xToolbar->Disable();
-    }
     return bChange || VclMultiLineEdit::PreNotify(rNEvt);
 }