strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cid#1608206 Double lock

Browse source 
Change-Id: I162e10b672277c77a7e0591b532d9197a79fc6d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172437
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara 2024-08-26 20:18:03 +01:00
parent e5924bdc22
commit f0f4779689
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
framework/source/uielement/recentfilesmenucontroller.cxx
View file

@ -99,6 +99,7 @@ private:
virtual void impl_setPopupMenu() override;
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
void executeEntry( sal_Int32 nIndex );
void executeEntryImpl(std::unique_lock<std::mutex>& rGuard, sal_Int32 nIndex);
std::vector<std::pair<OUString, bool>> m_aRecentFilesItems;
bool m_bDisabled : 1;
@ -330,7 +331,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
}
}
void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
void RecentFilesMenuController::executeEntryImpl(std::unique_lock<std::mutex>& rGuard, sal_Int32 nIndex)
{
if (( nIndex < 0 ) ||
( nIndex >= sal::static_int_cast<sal_Int32>( m_aRecentFilesItems.size() )))
@ -350,7 +351,13 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
aArgsList.realloc(aArgsList.size()+1);
aArgsList.getArray()[aArgsList.size()-1] = comphelper::makePropertyValue(u"ReadOnly"_ustr, true);
}
dispatchCommand(m_aRecentFilesItems[nIndex].first, aArgsList, u"_default"_ustr);
dispatchCommandImpl(rGuard, m_aRecentFilesItems[nIndex].first, aArgsList, u"_default"_ustr);
}
void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
{
std::unique_lock aLock(m_aMutex);
executeEntryImpl(aLock, nIndex);
}
// XEventListener
@ -477,7 +484,7 @@ void SAL_CALL RecentFilesMenuController::dispatch(
aEntryArg = aURL.Complete.subView( nEntryPos, nAddArgs-nEntryPos );
sal_Int32 nEntry = o3tl::toInt32(aEntryArg);
executeEntry( nEntry );
executeEntryImpl(aLock, nEntry);
}
}