[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

[Pranam Lashkari (via logerrit)]

 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |    2 +-
 sc/source/ui/sidebar/CellBorderStyleControl.cxx      |    4 ++--
 sc/source/ui/sidebar/CellBorderStyleControl.hxx      |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 91637957b6fc0131823587914ed977aaa565ffb4
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Sat May 30 10:43:56 2020 +0530
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sun May 31 06:16:05 2020 +0200

    Calc, sidebar: Cell Border selector isn't shown in online
    
    Change-Id: I43531270de0d3ed2458f0c33481e8e38e25ebe84
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95176
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index d46275768db6..6858cf148759 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -147,7 +147,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo
     if (aCommand == UNO_SETBORDERSTYLE)
     {
         if (!mxCellBorderStylePopup)
-            mxCellBorderStylePopup = VclPtr<CellBorderStylePopup>::Create(GetBindings()->GetDispatcher());
+            mxCellBorderStylePopup = VclPtr<CellBorderStylePopup>::Create(GetBindings()->GetDispatcher(), mpTBCellBorder->GetParent());
         mxCellBorderStylePopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus);
     }
 }
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 48bc135173a0..58eab958f67f 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -39,8 +39,8 @@ namespace sc { namespace sidebar {
 #define FRM_VALID_OUTER     0x0f
 #define FRM_VALID_ALL       0xff
 
-CellBorderStylePopup::CellBorderStylePopup(SfxDispatcher* pDispatcher)
-    : FloatingWindow(SfxGetpApp()->GetTopWindow(), "FloatingBorderStyle", "modules/scalc/ui/floatingborderstyle.ui")
+CellBorderStylePopup::CellBorderStylePopup(SfxDispatcher* pDispatcher, vcl::Window *pParent)
+    : FloatingWindow(pParent, "FloatingBorderStyle", "modules/scalc/ui/floatingborderstyle.ui")
     , mpDispatcher(pDispatcher)
 {
     get(maTBBorder1, "border1");
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index 3e413265bc1b..9d8eb46cf833 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -41,7 +41,7 @@ private:
     DECL_LINK(TB3SelectHdl, ToolBox *, void);
 
 public:
-    explicit CellBorderStylePopup(SfxDispatcher* pDispatcher);
+    explicit CellBorderStylePopup(SfxDispatcher* pDispatcher, vcl::Window *pParent);
     virtual ~CellBorderStylePopup() override;
     virtual void dispose() override;
 };