diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-18 11:34:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-19 09:05:58 +0200 |
| commit | cdbe8a8700d5460e41d80b00310c6ff8977bc492 (patch) | |
| tree | fb8f92ea13ccffad72894770ff75c8e8abc2a6c7 /ucb | |
| parent | 618baf4c5b40f19be6e47e1384fbc7a6b7610416 (diff) | |
loplugin:constantparam
and tweak the plugin to handle a crash seen with clang-9
Change-Id: Ie1ccf80c16a20dbca58e5bd081af13f75cf5ac8f
Reviewed-on: https://gerrit.libreoffice.org/75850
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index f9d1b8d503cd..770d3d38d988 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -216,8 +216,7 @@ XResultSet_impl::OneMore() } else if( err == osl::FileBase::E_None ) { - if (!m_pMyShell->getv( - nullptr, m_sProperty, aDirIte, aUnqPath, IsRegular, aRow )) + if (!m_pMyShell->getv( m_sProperty, aDirIte, aUnqPath, IsRegular, aRow )) { SAL_WARN( "ucb.ucp.file", diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 9601bb0cb088..163852099a20 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2465,7 +2465,6 @@ TaskManager::commit( const TaskManager::ContentMap::iterator& it, bool TaskManager::getv( - Notifier* pNotifier, const uno::Sequence< beans::Property >& properties, osl::DirectoryItem& aDirItem, OUString& aUnqPath, @@ -2514,8 +2513,6 @@ TaskManager::getv( else aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular; - if (pNotifier) - registerNotifier( aUnqPath,pNotifier ); insertDefaultProperties( aUnqPath ); { osl::MutexGuard aGuard( m_aMutex ); @@ -2534,8 +2531,6 @@ TaskManager::getv( return it1->getValue(); }); } - if (pNotifier) - deregisterNotifier( aUnqPath,pNotifier ); XRow_impl* p = new XRow_impl( this,seq ); row = uno::Reference< sdbc::XRow >( p ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 1bf1703bd1d5..45646ee59a0c 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -577,8 +577,7 @@ namespace fileaccess // is returned by osl::DirectoryItem::getNextItem() bool - getv( Notifier* pNotifier, - const css::uno::Sequence< css::beans::Property >& properties, + getv( const css::uno::Sequence< css::beans::Property >& properties, osl::DirectoryItem& DirItem, OUString& aUnqPath, bool& bIsRegular, |