diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-18 16:45:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-19 17:33:18 +0200 |
| commit | 3fb1417804a7f6f1e39e94d62f7f9199fd53a9bb (patch) | |
| tree | 3a5667c7295ff1a41a4c1dca9749202ead35e61e /fpicker/source | |
| parent | 4bc377da92e83192facb736d8dadc32891f99e25 (diff) | |
Drop ModalDialog middleman
Change-Id: I8bc39e1a85045a6e6c15735b440ada8c3abc222b
Reviewed-on: https://gerrit.libreoffice.org/81068
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/fpdialogbase.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 94649c6abb93..a2f8ffb63631 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -367,12 +367,12 @@ void RemoteFilesDialog::dispose() m_pListView_btn.clear(); m_pAddMenu.clear(); - ModalDialog::dispose(); + Dialog::dispose(); } void RemoteFilesDialog::Resize() { - ModalDialog::Resize(); + Dialog::Resize(); if( m_pFileView && m_pContainer ) { diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index f845812ff9ce..961ab53d2d6b 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -62,11 +62,11 @@ namespace o3tl { // SvtFileDialog_Base -class SvtFileDialog_Base : public ModalDialog, public ::svt::IFilePickerController +class SvtFileDialog_Base : public Dialog, public ::svt::IFilePickerController { public: SvtFileDialog_Base( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) - : ModalDialog( pParent, rID, rUIXMLDescription ) + : Dialog( pParent, rID, rUIXMLDescription ) { } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ed097017dc5e..15b95020b5ed 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -532,7 +532,7 @@ void SvtFileDialog::dispose() _pPbPlay.clear(); _pPrevWin.clear(); m_aDisabledControls.clear(); - ModalDialog::dispose(); + Dialog::dispose(); } void SvtFileDialog::Init_Impl @@ -1585,7 +1585,7 @@ bool SvtFileDialog::EventNotify( NotifyEvent& rNEvt ) } } } - return bRet || ModalDialog::EventNotify(rNEvt); + return bRet || Dialog::EventNotify(rNEvt); } namespace @@ -1661,7 +1661,7 @@ short SvtFileDialog::Execute() // start the dialog _bIsInExecute = true; - short nResult = ModalDialog::Execute(); + short nResult = Dialog::Execute(); _bIsInExecute = false; SAL_WARN_IF( m_pCurrentAsyncAction.is(), "fpicker.office", "SvtFilePicker::Execute: still running an async action!" ); @@ -1691,7 +1691,7 @@ bool SvtFileDialog::StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) return false; // start of the dialog - return ModalDialog::StartExecuteAsync(rCtx); + return Dialog::StartExecuteAsync(rCtx); } void SvtFileDialog::onAsyncOperationStarted() @@ -2269,7 +2269,7 @@ void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt ) if ( DataChangedEventType::SETTINGS == _rDCEvt.GetType() ) implUpdateImages( ); - ModalDialog::DataChanged( _rDCEvt ); + Dialog::DataChanged( _rDCEvt ); } |