diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-19 12:47:50 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-20 07:55:30 +0000 |
commit | 8a2149c1059c70d67b4897e8a7751cf028a5136b (patch) | |
tree | 10d01599b5b5b2ea1d361c32d438cf47371f21ae /framework | |
parent | 1b89a57aa5ac4faf59bc1e13eb1e0cad9933bacc (diff) |
clang-tidy misc-assign-operator-signature
Change-Id: I2953a88d9e2f5923732865ef17615d5928ac5f5f
Reviewed-on: https://gerrit.libreoffice.org/25154
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/helper/shareablemutex.hxx | 2 | ||||
-rw-r--r-- | framework/inc/jobs/jobdata.hxx | 2 | ||||
-rw-r--r-- | framework/inc/jobs/jobresult.hxx | 2 | ||||
-rw-r--r-- | framework/source/accelerators/storageholder.cxx | 3 | ||||
-rw-r--r-- | framework/source/fwi/helper/shareablemutex.cxx | 2 | ||||
-rw-r--r-- | framework/source/inc/accelerators/storageholder.hxx | 2 | ||||
-rw-r--r-- | framework/source/jobs/jobdata.cxx | 3 | ||||
-rw-r--r-- | framework/source/jobs/jobresult.cxx | 3 |
8 files changed, 11 insertions, 8 deletions
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index e354ab9e7da3..f28d524c7f07 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -35,7 +35,7 @@ class FWI_DLLPUBLIC ShareableMutex public: ShareableMutex(); ShareableMutex( const ShareableMutex& rShareableMutex ); - const ShareableMutex& operator=( const ShareableMutex& rShareableMutex ); + ShareableMutex& operator=( const ShareableMutex& rShareableMutex ); ~ShareableMutex() { m_pMutexRef->release(); } diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index e49716b7e392..a6bd78d7f29d 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -182,7 +182,7 @@ class JobData JobData( const JobData& rCopy ); virtual ~JobData( ); - void operator=( const JobData& rCopy ); + JobData& operator=( const JobData& rCopy ); EMode getMode () const; EEnvironment getEnvironment () const; diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index ef4c7cfb494e..3b5c4875acf9 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -109,7 +109,7 @@ class JobResult JobResult( const JobResult& rCopy ); virtual ~JobResult( ); - void operator=( const JobResult& rCopy ); + JobResult& operator=( const JobResult& rCopy ); bool existPart ( sal_uInt32 eParts ) const; std::vector< css::beans::NamedValue > getArguments ( ) const; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index cf7f55ce5958..977c700a7492 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -393,11 +393,12 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons return css::uno::Reference< css::embed::XStorage >(); } -void StorageHolder::operator=(const StorageHolder& rCopy) +StorageHolder& StorageHolder::operator=(const StorageHolder& rCopy) { osl::MutexGuard g(m_mutex); m_xRoot = rCopy.m_xRoot; m_lStorages = rCopy.m_lStorages; + return *this; } css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , diff --git a/framework/source/fwi/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx index 4f674c95e756..fba41f2b952e 100644 --- a/framework/source/fwi/helper/shareablemutex.cxx +++ b/framework/source/fwi/helper/shareablemutex.cxx @@ -34,7 +34,7 @@ ShareableMutex::ShareableMutex( const ShareableMutex& rShareableMutex ) m_pMutexRef->acquire(); } -const ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex ) +ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex ) { rShareableMutex.m_pMutexRef->acquire(); m_pMutexRef->release(); diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 60691c4b7dac..ce87fb8f165f 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -139,7 +139,7 @@ class StorageHolder /** @short TODO */ - void operator=(const StorageHolder& rCopy); + StorageHolder& operator=(const StorageHolder& rCopy); /** @short opens a sub element of the specified base storage. diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index c3b453d83691..c1807a4ea47c 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -71,7 +71,7 @@ JobData::JobData( const JobData& rCopy ) @param rCopy the original instance, from which we must copy all data */ -void JobData::operator=( const JobData& rCopy ) +JobData& JobData::operator=( const JobData& rCopy ) { SolarMutexGuard g; // Please don't copy the uno service manager reference. @@ -84,6 +84,7 @@ void JobData::operator=( const JobData& rCopy ) m_sEvent = rCopy.m_sEvent; m_lArguments = rCopy.m_lArguments; m_aLastExecutionResult = rCopy.m_aLastExecutionResult; + return *this; } /** diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 01adf16c9981..c9f5a0218af2 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -157,7 +157,7 @@ JobResult::~JobResult() @param rCopy reference to the other instance, which should be used for copying. */ -void JobResult::operator=( const JobResult& rCopy ) +JobResult& JobResult::operator=( const JobResult& rCopy ) { SolarMutexGuard g; m_aPureResult = rCopy.m_aPureResult; @@ -165,6 +165,7 @@ void JobResult::operator=( const JobResult& rCopy ) m_lArguments = rCopy.m_lArguments; m_bDeactivate = rCopy.m_bDeactivate; m_aDispatchResult = rCopy.m_aDispatchResult; + return *this; } /** |