diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-11 19:51:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-11 22:19:28 +0200 |
commit | b8061f41373cc90823c93cf9f025647c93496293 (patch) | |
tree | 5ffa8954183ec0fe07270381bc67bfc11699ed3d /sc/source/ui/view/cellsh1.cxx | |
parent | 28e9dcca1f2f0e1bd91e779bf772bcb4a9d8a9f4 (diff) |
weld ScCondFormatManagerDlg
Change-Id: Iccf2657f2c8fe98b4e975936fb75d56fc9523b5a
Reviewed-on: https://gerrit.libreoffice.org/72162
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/view/cellsh1.cxx')
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 7dc9a5e456ef..791716a66faf 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2541,8 +2541,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (!pList) pList = pDoc->GetCondFormList( aPos.Tab() ); + vcl::Window* pWin = pTabViewShell->GetDialogParent(); VclPtr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg( - pTabViewShell->GetDialogParent(), pDoc, pList)); + pWin ? pWin->GetFrameWeld() : nullptr, pDoc, pList)); if (pDlgItem) pDlg->SetModified(); @@ -2579,6 +2580,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (pDlgItem) pTabViewShell->GetPool().Remove(*pDlgItem); + + pDlg->disposeOnce(); }); } break; |