summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2022-01-08 19:31:51 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2022-01-08 18:52:16 +0100
commite44b54a847672836253f56feab9d9ed2c11c0bc7 (patch)
treea372c8a0f302f4c5e842099514caf5bb72f8d9d3 /toolkit/source
parent4e5bbcdc3d1fc4dd94ec896480ab049f3a4926fa (diff)
Fix build
Commit 326351e2b342eae5ca0154b2ba303b937a696577 crossed with commit b37f9fbf05e16eb58eae40c6d900a4b9da2972db. Change-Id: I1a10641aa0324e6af25698bb52d82157898c45d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128142 Tested-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/awt/vclxmenu.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 2e7e80636bf6..cbeb1ef7f810 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -822,7 +822,7 @@ VCLXMenu::getItemImage(
void VCLXMenu::setUserValue(sal_uInt16 nItemId, void* nUserValue, MenuUserDataReleaseFunction aFunc)
{
SolarMutexGuard aSolarGuard;
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+ std::unique_lock aGuard(maMutex);
mpMenu->SetUserValue(nItemId, nUserValue, aFunc);
}
@@ -830,7 +830,7 @@ void VCLXMenu::setUserValue(sal_uInt16 nItemId, void* nUserValue, MenuUserDataRe
void* VCLXMenu::getUserValue(sal_uInt16 nItemId)
{
SolarMutexGuard aSolarGuard;
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+ std::unique_lock aGuard(maMutex);
return mpMenu->GetUserValue(nItemId);
}