diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-16 13:49:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-18 09:49:14 +0100 |
| commit | 0fc7daed227ea6fd4fb3de04c92ae6cb765122c3 (patch) | |
| tree | 2de30ad2686820ddc336cf5b883720ef58723b83 /fpicker | |
| parent | 227100ff4e5560c09c5a822052fc5ada541b8cc5 (diff) | |
loplugin:singlevalfields
Change-Id: I0bb32ad7351f0e4cfbdc872ed0e81b8157ecc4cb
Reviewed-on: https://gerrit.libreoffice.org/83056
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 7 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 1 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index db90c2f7f0f5..8357cc8f330e 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -110,7 +110,7 @@ namespace return pFilter->GetType(); } - bool restoreCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl> const & pImpl ) + void restoreCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl> const & pImpl ) { SAL_WARN_IF( !pImpl->GetCurFilter(), "fpicker.office", "restoreCurrentFilter: no current filter!" ); SAL_WARN_IF( pImpl->GetCurFilterDisplayName().isEmpty(), "fpicker.office", "restoreCurrentFilter: no current filter (no display name)!" ); @@ -123,7 +123,6 @@ namespace && ( sSelectedDisplayName == pImpl->GetCurFilterDisplayName() ), "restoreCurrentFilter: inconsistence!" ); #endif - return pImpl->m_bNeedDelayedFilterExecute; } @@ -916,8 +915,7 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl, weld::ComboBox&, void ) { // there is no current selection. This happens if for instance the user selects a group separator using // the keyboard, and then presses enter: When the selection happens, we immediately deselect the entry, // so in this situation there is no current selection. - if ( restoreCurrentFilter( m_xImpl ) ) - ExecuteFilter(); + restoreCurrentFilter( m_xImpl ); } else { @@ -1072,7 +1070,6 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl void SvtFileDialog::ExecuteFilter() { - m_xImpl->m_bNeedDelayedFilterExecute = false; executeAsync( AsyncPickerAction::eExecuteFilter, OUString(), getMostCurrentFilter(m_xImpl) ); } diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 1ed153a7b248..89716e5c5b5d 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -121,7 +121,6 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl() , m_eDlgType( FILEDLG_TYPE_FILEDLG ) , m_nStyle( PickerFlags::NONE ) , m_bDoubleClick( false ) - , m_bNeedDelayedFilterExecute ( false ) , m_bMultiSelection( false ) { } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index e816f56ebd6b..27e2731fd29a 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -155,7 +155,6 @@ public: // shows OpenHdl_Imp() if the open was triggered by a double click bool m_bDoubleClick; - bool m_bNeedDelayedFilterExecute; // MultiSelection? bool m_bMultiSelection; |