diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-16 14:24:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-17 16:06:08 +0200 |
commit | a7e9db8338e93921ede5892545ce18655d08aad5 (patch) | |
tree | 49bc83e5724edde36908285b7cf681de2c07f6d9 /sd/qa | |
parent | 95401c5b3eef03497af6a85afc6e907c659ef6f7 (diff) |
weld SdPageDlg
Change-Id: Id9c78651d3eb315bf2e982eef48ef24071bfc79b
Reviewed-on: https://gerrit.libreoffice.org/60550
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/qa')
-rw-r--r-- | sd/qa/unit/dialogs-test.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index dd9a6d989bec..1fe44cc04243 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -327,8 +327,9 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateSdTabPageDialog(const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true) override; // needs a special SfxItemSet with merged content from page and other stuff, crashes without that (2nd page) // needs a 'SfxObjectShell* pDocShell', crashes without. Also sufficient: FillStyleItemSet with XFILL_NONE set + auto const parent = getViewShell()->GetActiveWindow(); pRetval = getSdAbstractDialogFactory()->CreateSdTabPageDialog( - getViewShell()->GetActiveWindow(), + parent == nullptr ? nullptr : parent->GetFrameWeld(), &getEmptyFillStyleSfxItemSet(), getDocShell(), true); |