diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-10 11:27:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-10 15:05:19 +0200 |
| commit | 5e245445200c5d094bb7eef76d8df3077b799ac5 (patch) | |
| tree | fef15b7e3568c09edc3d12ff0f6bdc45e76e47fb /sd/qa | |
| parent | 476ed0aed1c09055fa05209485919a026e5f014e (diff) | |
weld SdCustomShowDlg and SdDefineCustomShowDlg
Change-Id: I44d40a286eb5d70982284a270f340653858d38cf
Reviewed-on: https://gerrit.libreoffice.org/54076
Tested-by: Jenkins <ci@libreoffice.org>
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 a30643293ed1..a4a0a049bd7a 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -307,8 +307,9 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); + auto const parent = getViewShell()->GetActiveWindow(); pRetval = getSdAbstractDialogFactory()->CreateSdCustomShowDlg( - getViewShell()->GetActiveWindow(), + parent == nullptr ? nullptr : parent->GetFrameWeld(), *pDrawDoc); break; } |