diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 09:40:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 16:58:19 +0100 |
| commit | d465d5b1cc962f56534d685fe8af5f26083fb7ba (patch) | |
| tree | c709eb4025e46325ce0f3c3595eb27cf2b178085 /sfx2/source/view | |
| parent | 39759e85d9931ba9dcee04bb4010c51d729b7ecf (diff) | |
can avoid intermediate vcl::Window use
Change-Id: I51d1a84fdf7a8c7d204691d52dec10db051c3b00
Reviewed-on: https://gerrit.libreoffice.org/81745
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index d810bd44374e..be9b43cd9035 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -878,8 +878,7 @@ sal_Int64 SfxInPlaceClient::GetAspect() const ErrCode SfxInPlaceClient::DoVerb( long nVerb ) { - vcl::Window* pWin = m_pViewSh->GetWindow(); - SfxErrorContext aEc(ERRCTX_SO_DOVERB, pWin ? pWin->GetFrameWeld() : nullptr, RID_SO_ERRCTX); + SfxErrorContext aEc(ERRCTX_SO_DOVERB, m_pViewSh->GetFrameWeld(), RID_SO_ERRCTX); ErrCode nError = ERRCODE_NONE; if ( m_xImp->m_xObject.is() ) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 31befa4e2987..2347f69584c4 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -350,8 +350,7 @@ void SfxPrinterController::jobFinished( css::view::PrintableState nState ) OUString aMsg( SfxResId(STR_NOSTARTPRINTER) ); if ( !m_bApi ) { - vcl::Window* pWindow = mpViewShell->GetWindow(); - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pWindow ? pWindow->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(mpViewShell->GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, aMsg)); xBox->run(); |