diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 09:59:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 12:45:20 +0200 |
| commit | 1b0c6d796306a914880c86380e0b18741acfa16c (patch) | |
| tree | 2f92856a52c72747bd4e7975a716b3f014f46045 | |
| parent | Updated core (diff) | |
| download | core-1b0c6d796306a914880c86380e0b18741acfa16c.tar.gz core-1b0c6d796306a914880c86380e0b18741acfa16c.zip | |
CancelableDialog mbModal is always false
Change-Id: Ie42a96cf21eb0a7967fb4d0a6c64a221a44e1b53
Reviewed-on: https://gerrit.libreoffice.org/54303
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/dbui/dbui.cxx | 15 | ||||
| -rw-r--r-- | sw/source/uibase/inc/dbui.hxx | 5 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index 9ed1334bb8b7..a29e3c566eb6 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -37,7 +37,7 @@ SaveMonitor::~SaveMonitor() } PrintMonitor::PrintMonitor(vcl::Window *pParent) - : CancelableDialog(pParent, false, "PrintMonitorDialog", + : CancelableDialog(pParent, "PrintMonitorDialog", "modules/swriter/ui/printmonitordialog.ui") { get(m_pDocName, "docname"); @@ -63,7 +63,7 @@ void PrintMonitor::dispose() // Progress Indicator for Creation of personalized Mail Merge documents: CreateMonitor::CreateMonitor(vcl::Window *pParent) - : CancelableDialog(pParent, false, "MMCreatingDialog", + : CancelableDialog(pParent, "MMCreatingDialog", "modules/swriter/ui/mmcreatingdialog.ui") , m_sCountingPattern() , m_sVariable_Total("%Y") @@ -109,11 +109,9 @@ void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent ) UpdateCountingText(); } -CancelableDialog::CancelableDialog( vcl::Window *pParent, bool modal, +CancelableDialog::CancelableDialog( vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription ) - : Dialog( pParent , rID, rUIXMLDescription, - modal ? WindowType::MODALDIALOG : WindowType::MODELESSDIALOG ) - , mbModal( modal ) + : Dialog(pParent, rID, rUIXMLDescription, WindowType::MODELESSDIALOG) { get(m_pCancelButton, "cancel"); } @@ -138,10 +136,7 @@ void CancelableDialog::SetCancelHdl( const Link<Button*,void>& rLink ) void CancelableDialog::Show() { - if (mbModal) - StartExecuteModal( Link<Dialog&,void>() ); - else - Dialog::Show(); + Dialog::Show(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index b313834d863b..b8935890c462 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -27,15 +27,12 @@ class SW_DLLPUBLIC CancelableDialog : public Dialog { - bool mbModal; - protected: VclPtr<CancelButton> m_pCancelButton; - CancelableDialog( vcl::Window *pParent, bool modal, const OUString& rID, + CancelableDialog( vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription ); using Dialog::Execute; - using Dialog::StartExecuteModal; public: virtual ~CancelableDialog() override; |