summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranam Lashkari <lpranam@collabora.com>2020-05-06 20:22:30 +0530
committerAndras Timar <andras.timar@collabora.com>2020-05-10 09:51:14 +0200
commit0bbdfc152f9a3844d0c5f23e82e2c48e2d424ef7 (patch)
treed741e02a8c1f8f271c9db4c0d1bb330829ae610c
parent987cc89f3f737704f50f167fadb3017a32716bfd (diff)
Calc, sidebar: Cell Border selector isn't shown in online
Change-Id: I43531270de0d3ed2458f0c33481e8e38e25ebe84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93575 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx2
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.cxx4
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.hxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index e1aadc00307b..8720a9ad0378 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -150,7 +150,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 353880a9fb3f..9c9583f89c0d 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -40,8 +40,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 a288f1a3eaca..e30a25f95910 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -43,7 +43,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;
};