ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

osl::Mutex->std::mutex in SvtUserOptions

Browse Source 
Change-Id: Ib16cc05a8d9c3e7ef828223e8b1067eeb7faf809
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127399
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-12-24 19:10:25 +01:00
committed by Noel Grandin
parent 4621e719c2
commit ac511d90cd
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/unotools/useroptions.hxx
-2
View File
@@ -60,8 +60,6 @@ public:
SvtUserOptions ();
virtual ~SvtUserOptions () override;
static osl::Mutex& GetInitMutex ();
// get the address token
OUString GetCompany () const;
OUString GetFirstName () const;
unotools/source/config/useroptions.cxx
+18 -16
View File
@@ -259,34 +259,36 @@ bool SvtUserOptions::Impl::IsTokenReadonly (UserOptToken nToken) const
beans::PropertyAttribute::READONLY);
}
static std::mutex& GetInitMutex()
{
static std::mutex gMutex;
return gMutex;
}
SvtUserOptions::SvtUserOptions ()
{
// Global access, must be guarded (multithreading)
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
if (xSharedImpl.expired())
xImpl = xSharedImpl.lock();
if (!xImpl)
{
xImpl = std::make_shared<Impl>();
xSharedImpl = xImpl;
aGuard.unlock(); // because holdConfigItem will call this constructor
ItemHolder1::holdConfigItem(EItem::UserOptions);
}
xImpl = xSharedImpl.lock();
xImpl->AddListener(this);
}
SvtUserOptions::~SvtUserOptions()
{
// Global access, must be guarded (multithreading)
osl::MutexGuard aGuard( GetInitMutex() );
std::unique_lock aGuard( GetInitMutex() );
xImpl->RemoveListener(this);
}
osl::Mutex& SvtUserOptions::GetInitMutex()
{
static osl::Mutex gMutex;
return gMutex;
}
OUString SvtUserOptions::GetCompany () const { return GetToken(UserOptToken::Company); }
OUString SvtUserOptions::GetFirstName () const { return GetToken(UserOptToken::FirstName); }
OUString SvtUserOptions::GetLastName () const { return GetToken(UserOptToken::LastName); }
@@ -307,37 +309,37 @@ OUString SvtUserOptions::GetEncryptionKey () const { return GetToken(UserOptTok
bool SvtUserOptions::IsTokenReadonly (UserOptToken nToken) const
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
return xImpl->IsTokenReadonly(nToken);
}
OUString SvtUserOptions::GetToken (UserOptToken nToken) const
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
return xImpl->GetToken(nToken);
}
void SvtUserOptions::SetToken (UserOptToken nToken, OUString const& rNewToken)
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
xImpl->SetToken(nToken, rNewToken);
}
void SvtUserOptions::SetBoolValue (UserOptToken nToken, bool bNewValue)
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
xImpl->SetBoolValue(nToken, bNewValue);
}
bool SvtUserOptions::GetEncryptToSelf() const
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
return xImpl->GetBoolValue(UserOptToken::EncryptToSelf);
}
OUString SvtUserOptions::GetFullName () const
{
osl::MutexGuard aGuard(GetInitMutex());
std::unique_lock aGuard(GetInitMutex());
return xImpl->GetFullName();
}