framework/source/jobs/jobresult.cxx | 19 +++----------------
framework/source/jobs/joburl.cxx | 7 -------
2 files changed, 3 insertions(+), 23 deletions(-)
New commits:
commit 5e193d854596db714ca786c2a676b5ac9684d5eb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 27 15:46:28 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 27 17:18:31 2023 +0000
JobURL does not need to use the SolarMutex
it is only used and accessed as a local stack variable inside two
methods
Change-Id: I651dad0912dd47d3670e7b341d444d17e200efc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146260
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index efff201a8401..fc1424867d99 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -99,7 +99,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
*/
bool JobURL::isValid() const
{
- SolarMutexGuard g;
return (m_eRequest!=E_UNKNOWN);
}
@@ -121,8 +120,6 @@ bool JobURL::isValid() const
*/
bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
{
- SolarMutexGuard g;
-
sEvent.clear();
bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
@@ -149,8 +146,6 @@ bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
*/
bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
{
- SolarMutexGuard g;
-
sAlias.clear();
bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
@@ -177,8 +172,6 @@ bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
*/
bool JobURL::getService( /*OUT*/ OUString& sService ) const
{
- SolarMutexGuard g;
-
sService.clear();
bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
commit fbb8e0f40771154796bca5277cbd494a689599de
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 27 15:43:04 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 27 17:18:20 2023 +0000
JobResult does not need to use the SolarMutex
it is literally only used inside a single method
Change-Id: I01082270208b9e6c9bbaae0e7edf66f5e171a280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146259
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/source/jobs/jobresult.cxx
b/framework/source/jobs/jobresult.cxx
index 58cd2b59401c..183543606b59 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -142,7 +142,6 @@ JobResult::~JobResult()
*/
JobResult& JobResult::operator=(const JobResult& rCopy)
{
- SolarMutexGuard g;
m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments;
m_aDispatchResult = rCopy.m_aDispatchResult;
@@ -161,11 +160,7 @@ JobResult& JobResult::operator=(const JobResult& rCopy)
@return We return true only, if any set flag of the given mask match.
*/
-bool JobResult::existPart(sal_uInt32 eParts) const
-{
- SolarMutexGuard g;
- return ((m_eParts & eParts) == eParts);
-}
+bool JobResult::existPart(sal_uInt32 eParts) const { return ((m_eParts &
eParts) == eParts); }
/**
@short provides access to our internal members
@@ -175,17 +170,9 @@ bool JobResult::existPart(sal_uInt32 eParts) const
@return It returns the state of the internal member
without any checks!
*/
-std::vector<css::beans::NamedValue> JobResult::getArguments() const
-{
- SolarMutexGuard g;
- return m_lArguments;
-}
+std::vector<css::beans::NamedValue> JobResult::getArguments() const { return
m_lArguments; }
-css::frame::DispatchResultEvent JobResult::getDispatchResult() const
-{
- SolarMutexGuard g;
- return m_aDispatchResult;
-}
+css::frame::DispatchResultEvent JobResult::getDispatchResult() const { return
m_aDispatchResult; }
} // namespace framework
