mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CancelableDialog mbModal is always false

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2018-05-14 09:59:25 +01:00
parent 5224f99a40
commit 1b0c6d7963
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sw/source/uibase/dbui/dbui.cxx
View File

@@ -37,7 +37,7 @@ SaveMonitor::~SaveMonitor()
} }
PrintMonitor::PrintMonitor(vcl::Window *pParent) PrintMonitor::PrintMonitor(vcl::Window *pParent)
: CancelableDialog(pParent, false, "PrintMonitorDialog", : CancelableDialog(pParent, "PrintMonitorDialog",
"modules/swriter/ui/printmonitordialog.ui") "modules/swriter/ui/printmonitordialog.ui")
{ {
get(m_pDocName, "docname"); get(m_pDocName, "docname");
@@ -63,7 +63,7 @@ void PrintMonitor::dispose()
// Progress Indicator for Creation of personalized Mail Merge documents: // Progress Indicator for Creation of personalized Mail Merge documents:
CreateMonitor::CreateMonitor(vcl::Window *pParent) CreateMonitor::CreateMonitor(vcl::Window *pParent)
: CancelableDialog(pParent, false, "MMCreatingDialog", : CancelableDialog(pParent, "MMCreatingDialog",
"modules/swriter/ui/mmcreatingdialog.ui") "modules/swriter/ui/mmcreatingdialog.ui")
, m_sCountingPattern() , m_sCountingPattern()
, m_sVariable_Total("%Y") , m_sVariable_Total("%Y")
@@ -109,11 +109,9 @@ void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent )
UpdateCountingText(); UpdateCountingText();
} }
CancelableDialog::CancelableDialog( vcl::Window *pParent, bool modal, CancelableDialog::CancelableDialog( vcl::Window *pParent,
const OUString& rID, const OUString& rUIXMLDescription ) const OUString& rID, const OUString& rUIXMLDescription )
: Dialog( pParent , rID, rUIXMLDescription, : Dialog(pParent, rID, rUIXMLDescription, WindowType::MODELESSDIALOG)
modal ? WindowType::MODALDIALOG : WindowType::MODELESSDIALOG )
, mbModal( modal )
{ {
get(m_pCancelButton, "cancel"); get(m_pCancelButton, "cancel");
} }
@@ -138,9 +136,6 @@ void CancelableDialog::SetCancelHdl( const Link<Button*,void>& rLink )
void CancelableDialog::Show() void CancelableDialog::Show()
{ {
if (mbModal)
StartExecuteModal( Link<Dialog&,void>() );
else
Dialog::Show(); Dialog::Show();
} }

5
sw/source/uibase/inc/dbui.hxx
View File

@@ -27,15 +27,12 @@
class SW_DLLPUBLIC CancelableDialog : public Dialog class SW_DLLPUBLIC CancelableDialog : public Dialog
{ {
bool mbModal;
protected: protected:
VclPtr<CancelButton> m_pCancelButton; VclPtr<CancelButton> m_pCancelButton;
CancelableDialog( vcl::Window *pParent, bool modal, const OUString& rID, CancelableDialog( vcl::Window *pParent, const OUString& rID,
const OUString& rUIXMLDescription ); const OUString& rUIXMLDescription );
using Dialog::Execute; using Dialog::Execute;
using Dialog::StartExecuteModal;
public: public:
virtual ~CancelableDialog() override; virtual ~CancelableDialog() override;