comphelper/source/misc/numberedcollection.cxx | 54 +++++++++++---------------
include/comphelper/numberedcollection.hxx | 8 ++-
2 files changed, 29 insertions(+), 33 deletions(-)
New commits:
commit ab4ee55a2a03ce93debcda41d817a95517a711f0
Author: Arnaud Versini <arnaud.vers...@libreoffice.org>
AuthorDate: Sun Oct 24 19:44:12 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 16 16:51:30 2021 +0100
comphelper : use std::mutex in numberedcollection
Change-Id: Ifd8b1668ceac69f5393a279ffb19070655149e65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124126
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/comphelper/source/misc/numberedcollection.cxx
b/comphelper/source/misc/numberedcollection.cxx
index 0a771a333251..efadf0fd5a6d 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -28,7 +28,6 @@ constexpr OUStringLiteral ERRMSG_INVALID_COMPONENT_PARAM =
u"NULL as component r
NumberedCollection::NumberedCollection()
- : ::cppu::BaseMutex ()
{
}
@@ -41,7 +40,7 @@ NumberedCollection::~NumberedCollection()
void NumberedCollection::setOwner(const css::uno::Reference<
css::uno::XInterface >& xOwner)
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
m_xOwner = xOwner;
@@ -52,7 +51,7 @@ void NumberedCollection::setOwner(const css::uno::Reference<
css::uno::XInterfac
void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
m_sUntitledPrefix = sPrefix;
@@ -63,7 +62,7 @@ void NumberedCollection::setUntitledPrefix(const OUString&
sPrefix)
::sal_Int32 SAL_CALL NumberedCollection::leaseNumber(const
css::uno::Reference< css::uno::XInterface >& xComponent)
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
if ( ! xComponent.is ())
throw
css::lang::IllegalArgumentException(ERRMSG_INVALID_COMPONENT_PARAM,
m_xOwner.get(), 1);
@@ -98,7 +97,7 @@ void NumberedCollection::setUntitledPrefix(const OUString&
sPrefix)
void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
if (nNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
throw css::lang::IllegalArgumentException ("Special valkud
INVALID_NUMBER not allowed as input parameter.", m_xOwner.get(), 1);
@@ -135,7 +134,7 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32
nNumber)
void SAL_CALL NumberedCollection::releaseNumberForComponent(const
css::uno::Reference< css::uno::XInterface >& xComponent)
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
if ( ! xComponent.is ())
throw
css::lang::IllegalArgumentException(ERRMSG_INVALID_COMPONENT_PARAM,
m_xOwner.get(), 1);
@@ -157,7 +156,7 @@ void SAL_CALL
NumberedCollection::releaseNumberForComponent(const css::uno::Refe
OUString SAL_CALL NumberedCollection::getUntitledPrefix()
{
// SYNCHRONIZED ->
- osl::MutexGuard aLock(m_aMutex);
+ std::scoped_lock aLock(m_aMutex);
return m_sUntitledPrefix;
@@ -191,36 +190,31 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix()
for (i=1; i<=c; ++i)
lPossibleNumbers.push_back (i);
- // SYNCHRONIZED ->
+ TDeadItemList lDeadItems;
+
+ for (const auto& [rComponent, rItem] : m_lComponents)
{
- osl::MutexGuard aLock(m_aMutex);
- TDeadItemList lDeadItems;
+ const css::uno::Reference< css::uno::XInterface > xItem =
rItem.xItem.get();
- for (const auto& [rComponent, rItem] : m_lComponents)
+ if ( ! xItem.is ())
{
- const css::uno::Reference< css::uno::XInterface > xItem =
rItem.xItem.get();
-
- if ( ! xItem.is ())
- {
- lDeadItems.push_back(rComponent);
- continue;
- }
-
- std::vector< ::sal_Int32 >::iterator pPossible =
std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber);
- if (pPossible != lPossibleNumbers.end ())
- lPossibleNumbers.erase (pPossible);
+ lDeadItems.push_back(rComponent);
+ continue;
}
- impl_cleanUpDeadItems(m_lComponents, lDeadItems);
+ std::vector< ::sal_Int32 >::iterator pPossible =
std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber);
+ if (pPossible != lPossibleNumbers.end ())
+ lPossibleNumbers.erase (pPossible);
+ }
- // a) non free numbers ... return INVALID_NUMBER
- if (lPossibleNumbers.empty())
- return css::frame::UntitledNumbersConst::INVALID_NUMBER;
+ impl_cleanUpDeadItems(m_lComponents, lDeadItems);
- // b) return first free number
- return *(lPossibleNumbers.begin ());
- }
- // <- SYNCHRONIZED
+ // a) non free numbers ... return INVALID_NUMBER
+ if (lPossibleNumbers.empty())
+ return css::frame::UntitledNumbersConst::INVALID_NUMBER;
+
+ // b) return first free number
+ return *(lPossibleNumbers.begin ());
}
void NumberedCollection::impl_cleanUpDeadItems ( TNumberedItemHash&
lItems ,
diff --git a/include/comphelper/numberedcollection.hxx
b/include/comphelper/numberedcollection.hxx
index cafe975b59c7..3dbb1f534e9d 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -25,11 +25,11 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/frame/XUntitledNumbers.hpp>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase.hxx>
#include <unordered_map>
+#include <mutex>
#include <vector>
namespace com::sun::star::uno { class XInterface; }
@@ -44,8 +44,8 @@ namespace comphelper{
@threadsafe
*/
-class COMPHELPER_DLLPUBLIC NumberedCollection final : private ::cppu::BaseMutex
- , public
::cppu::WeakImplHelper< css::frame::XUntitledNumbers >
+class COMPHELPER_DLLPUBLIC NumberedCollection final :
+ public ::cppu::WeakImplHelper<
css::frame::XUntitledNumbers >
{
// types, const
@@ -157,6 +157,8 @@ class COMPHELPER_DLLPUBLIC NumberedCollection final :
private ::cppu::BaseMutex
/// used as source of broadcasted messages or exceptions (can be null
!)
css::uno::WeakReference< css::uno::XInterface > m_xOwner;
+
+ std::mutex m_aMutex;
};
} // namespace comphelper
