framework/source/services/autorecovery.cxx | 11 ----------- 1 file changed, 11 deletions(-)
New commits: commit afb95717c2c17d6f6c54abf0a0719d082d00e7f5 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Sep 30 14:50:08 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Oct 1 15:43:25 2021 +0200 else branch doesn't make sense, dereferences null if xModel.is() is false then xModel->getCurrentController() is just going to crash. like this since it was introduced in commit eafba820349005ea5426cab58911f9ff99969966 Date: Tue Jan 5 22:32:38 2010 +0100 autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery Change-Id: I8ea43a0679d43cb9b865ecae5260129d17b6a386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122898 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9fc7470bf398..7b66409014b9 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1966,17 +1966,6 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i aViewNames.push_back( sViewName ); } } - else - { - const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY ); - OUString sViewName; - if ( xController.is() ) - sViewName = xController->getViewControllerName(); - OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" ); - - if ( !sViewName.isEmpty() ) - aViewNames.push_back( sViewName ); - } i_rInfo.ViewNames.realloc( aViewNames.size() ); ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() );