diff options
author | Jan Holesovsky <kendy@collabora.com> | 2018-02-21 19:58:11 +0100 |
---|---|---|
committer | Marco Cecchetti <mrcekets@gmail.com> | 2018-02-22 11:13:15 +0100 |
commit | 274c86af3ce7e665aee232e4e9fee76fe22af0bd (patch) | |
tree | 41c89fe3d48cf3f30eb554c7c3ba457db18e94f1 /sc | |
parent | fdfc29078f64223148354551c1cb3b2169454350 (diff) |
sc lok: Make the Validation "Invalid value." message box working.
Change-Id: Ic0131fa6fc397ae440efed834266b8396aa9e619
Reviewed-on: https://gerrit.libreoffice.org/50122
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 48d7fd0eb58d..0a84c9d60584 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2656,8 +2656,12 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode ) if ( pActiveViewSh ) // If it came from MouseButtonDown pActiveViewSh->StopMarking(); // (the InfoBox consumes the MouseButtonUp) - //FIXME: We still run into problems if the input is triggered by activating another View - vcl::Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = nullptr; + if (pActiveViewSh) + pParent = &pActiveViewSh->GetViewFrame()->GetWindow(); + else + pParent = Application::GetDefDialogParent(); + if ( pData->DoError( pParent, aString, aCursorPos ) ) bForget = true; // Do not take over input } |