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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit a95dc94446b2a19db6223efe174e2cff09464664
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 28 19:43:10 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 1 10:10:53 2021 +0100

    FloatingWindow::StateChanged will set the same ILibreOfficeKitNotifier
    
    as set here so it doesn't seem necessary to explicitly set it. The
    very similar ScenarioMenu doesn't do this.
    
    Change-Id: I6454cbdcb464b401df6cb1d6171fc2212f3be3ae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111717
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e17a03de5971..28d8ecfb1ba3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1030,7 +1030,7 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
     //  (It looks odd if the line gets hidden...)
 
     mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this));
-    mpFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) );
+    mpFilterFloat->SetPopupModeEndHdl(LINK(this, ScGridWindow, PopupModeEndHdl));
     mpFilterBox.reset(VclPtr<ScFilterListBox>::Create(mpFilterFloat.get(), this, nCol, nRow, ScFilterBoxMode::Scenario));
     weld::TreeView& rFilterBox = mpFilterBox->get_widget();
     rFilterBox.set_direction(bLayoutRTL); // Fix for bug fdo#44925 use sheet direction for widget RTL/LTR
@@ -1117,11 +1117,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow )
     aPos.AdjustY( nSizeY - 1 );
 
     mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this));
-    if (bLOKActive)
-    {
-        mpFilterFloat->SetLOKNotifier(SfxViewShell::Current());
-    }
-    mpFilterFloat->SetPopupModeEndHdl(LINK( this, ScGridWindow, PopupModeEndHdl));
+    mpFilterFloat->SetPopupModeEndHdl(LINK(this, ScGridWindow, PopupModeEndHdl));
     mpFilterBox.reset(VclPtr<ScFilterListBox>::Create(mpFilterFloat.get(), this, nCol, nRow, ScFilterBoxMode::DataSelect));
     weld::TreeView& rFilterBox = mpFilterBox->get_widget();
     rFilterBox.set_direction(bLayoutRTL); // Fix for bug fdo#44925 use sheet direction for widget RTL/LTR