diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-05 20:19:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-06 17:32:08 +0200 |
| commit | 3880bf655fd449a8def384240b43b088536a8a4b (patch) | |
| tree | 4510b102f88f13c11e0e9a9e762c2982c63d5b31 /sd/qa/unit | |
| parent | 36ed48a4f75fd9f014d161a48de5d11dc941b1cf (diff) | |
weld HeaderFooterDialog
Change-Id: I6a5068106d0f243646cf12ec676dff60a04922ee
Reviewed-on: https://gerrit.libreoffice.org/73596
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/qa/unit')
| -rw-r--r-- | sd/qa/unit/dialogs-test.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index fce330067d9f..05ab4168b181 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -578,7 +578,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) } case 22: { - // CreateHeaderFooterDialog(sd::ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) override; + // CreateHeaderFooterDialog(sd::ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) override; // This is a hard case, for two reasons: // - It uses BaseClass TabPage which has a very sparse interface, // need to add 'Screenshot interface' there and implement @@ -589,9 +589,10 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) CPPUNIT_ASSERT(pDrawDoc); SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); CPPUNIT_ASSERT(pSdPage); + auto const parent = Application::GetDefDialogParent(); pRetval = getSdAbstractDialogFactory()->CreateHeaderFooterDialog( getViewShell(), - Application::GetDefDialogParent(), + parent == nullptr ? nullptr : parent->GetFrameWeld(), pDrawDoc, pSdPage); break; |