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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 104173946f1989bc7d7b36855a5058da8cc3409c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jun 14 20:20:10 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 15 10:05:30 2020 +0200

    WinBits are always the same for ScFilterFloatingWindow
    
    Change-Id: Icb43adb273f44014499c25ae8b6ab535f2a7d6d6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96300
    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 7c318e09cad6..1cda62bba554 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -317,16 +317,17 @@ namespace {
 class ScFilterFloatingWindow : public FloatingWindow
 {
 public:
-    ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle );
+    ScFilterFloatingWindow(vcl::Window* pParent);
     virtual ~ScFilterFloatingWindow() override;
     virtual void dispose() override;
 };
 
 }
 
-ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle ) :
-    FloatingWindow( pParent, nStyle|WB_SYSTEMWINDOW ) // make it a system floater
-    {}
+ScFilterFloatingWindow::ScFilterFloatingWindow(vcl::Window* pParent)
+    : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW ) // make it a system floater
+{
+}
 
 ScFilterFloatingWindow::~ScFilterFloatingWindow()
 {
@@ -1022,7 +1023,7 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
     //  Place the ListBox directly below the black line of the cell grid
     //  (It looks odd if the line gets hidden...)
 
-    mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this, WinBits(WB_BORDER)));
+    mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this));
     mpFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) );
     mpFilterBox.reset(VclPtr<ScFilterListBox>::Create(mpFilterFloat.get(), this, nCol, nRow, ScFilterBoxMode::Scenario));
     weld::TreeView& rFilterBox = mpFilterBox->get_widget();
@@ -1114,7 +1115,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow )
     aPos.AdjustX( -1 );
     aPos.AdjustY( nSizeY - 1 );
 
-    mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this, WinBits(WB_BORDER)));
+    mpFilterFloat.reset(VclPtr<ScFilterFloatingWindow>::Create(this));
     if (bLOKActive)
     {
         mpFilterFloat->SetLOKNotifier(SfxViewShell::Current());