[Libreoffice-commits] core.git: sc/source

[Kohei Yoshida]

 sc/source/ui/app/inputwin.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d33a81c24ec0b4a05eb0b69fa85c5fd7eb8ec5a7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Nov 23 17:30:46 2016 -0500

    Reduce the indirection count...
    
    ... by getting the input handler instance directly from the view
    shell that owns it.
    
    Change-Id: I3b6e74285f64457d694db05d591461b291fa34c5

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d290deb..902c1f7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1107,7 +1107,9 @@ void ScTextWnd::StartEditEngine()
         InitEditEngine();
     }
 
-    SC_MOD()->SetInputMode( SC_INPUT_TOP );
+    ScInputHandler* pHdl = mpViewShell->GetInputHandler();
+    if (pHdl)
+        pHdl->SetMode(SC_INPUT_TOP);
 
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     if (pViewFrm)
@@ -1557,8 +1559,10 @@ void ScTextWnd::StopEditEngine( bool bAll )
         mpEditView.reset();
         mpEditEngine.reset();
 
-        if ( pScMod->IsEditMode() && !bAll )
-            pScMod->SetInputMode(SC_INPUT_TABLE);
+        ScInputHandler* pHdl = mpViewShell->GetInputHandler();
+
+        if (pHdl && pHdl->IsEditMode() && !bAll)
+            pHdl->SetMode(SC_INPUT_TABLE);
 
         SfxViewFrame* pViewFrm = SfxViewFrame::Current();
         if (pViewFrm)