diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-08-05 19:46:35 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-06 10:55:18 +0200 |
commit | 1aee8678c83c637a2d5c1e0a716528b0bcf11de0 (patch) | |
tree | 922a5e37d98f547bf0880c2e57a8bbedd0709a63 /vcl/unx/generic | |
parent | 373da7a00986ea95ce959242c0876a5eaf18a1b6 (diff) |
drop intermediate vcl::Window from Application::GetDefDialogParent
Change-Id: I96be984cbefeb8e45bf49de4c50a225a46fbefb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120089
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index bd511f6d9326..19ec3206287f 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -134,8 +134,7 @@ namespace int QueryFaxNumber(OUString& rNumber) { - vcl::Window* pWin = Application::GetDefDialogParent(); - QueryString aQuery(pWin ? pWin->GetFrameWeld() : nullptr, VclResId(SV_PRINT_QUERYFAXNUMBER_TXT), rNumber); + QueryString aQuery(Application::GetDefDialogParent(), VclResId(SV_PRINT_QUERYFAXNUMBER_TXT), rNumber); return aQuery.run(); } } diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 6ac997d14c10..5c7fb3013e73 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -737,8 +737,7 @@ namespace { bool bRet = false; - vcl::Window* pWin = Application::GetDefDialogParent(); - RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr, rServer, rUserName); + RTSPWDialog aDialog(Application::GetDefDialogParent(), rServer, rUserName); if (aDialog.run() == RET_OK) { rUserName = aDialog.getUserName(); @@ -828,8 +827,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi { OString sPrinterName(OUStringToOString(rPrintername, RTL_TEXTENCODING_UTF8)); OString sUser = cupsUser(); - vcl::Window* pWin = Application::GetDefDialogParent(); - RTSPWDialog aDialog(pWin ? pWin->GetFrameWeld() : nullptr, sPrinterName, sUser); + RTSPWDialog aDialog(Application::GetDefDialogParent(), sPrinterName, sUser); aDialog.SetDomainVisible(bDomain); aDialog.SetUserVisible(bUser); aDialog.SetPassVisible(bPass); |