diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 08:55:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-28 11:13:21 +0100 |
| commit | de6f36cc2fb359332205ba836f8396a1cdbe44c2 (patch) | |
| tree | a7b4dfcd77bffe4ca90c2f5763aa5ef9b20a5c39 /desktop | |
| parent | 1d39c5aa7bd6419060ed10d9fbdc2a643000f363 (diff) | |
simplify reset(nullptr) -> reset()
Change-Id: Iec5e93d9c59dde44571376e46fb98ea854e16b6c
Reviewed-on: https://gerrit.libreoffice.org/69784
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 1f910a6b1f21..e584858b3191 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1731,8 +1731,8 @@ int Desktop::doShutdown() // be sure that path/language options gets destroyed before // UCB is deinitialized - pExecGlobals->pLanguageOptions.reset( nullptr ); - pExecGlobals->pPathOptions.reset( nullptr ); + pExecGlobals->pLanguageOptions.reset(); + pExecGlobals->pPathOptions.reset(); comphelper::ThreadPool::getSharedOptimalPool().shutdown(); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 12098a26a733..f4718e5c738f 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -486,7 +486,7 @@ void PackageManagerImpl::disposing() m_xLogFile.clear(); try_dispose( m_xRegistry ); m_xRegistry.clear(); - m_activePackagesDB.reset(nullptr); + m_activePackagesDB.reset(); m_xComponentContext.clear(); t_pm_helper::disposing(); |