compilerplugins/clang/mergeclasses.results | 2 ++
configmgr/source/components.cxx | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8976d09cdf0411472765f5faecc6335d9ea8fd9a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 12 10:27:04 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 12 11:04:29 2025 +0100
update mergeclasses
Change-Id: I1cf3a1487ffdf9e344248854109eec70dda6336b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181468
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index 39636add741f..faacf8fd538b 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -33,6 +33,7 @@ merge (anonymous namespace)::empty with (anonymous
namespace)::second
maybe merge AbstractMailMergeWizard with vcl::AbstractDialogImpl_BASE, in
modules sw and vcl
merge AbstractSmParser with SmParser5
maybe merge AbstractSwInsertDBColAutoPilot with vcl::AbstractDialogImpl_BASE,
in modules sw and vcl
+maybe merge AccessibleBrowseBoxCell with cppu::ImplInheritanceHelper, in
modules vcl and cppuhelper
merge AddressWalker with AddressWalkerWriter
merge AutoIdle with (anonymous namespace)::TestAutoIdleRR
merge B3dTransformationSet with B3dViewport
@@ -452,6 +453,7 @@ merge comphelper::ICryptoImplementation with
comphelper::(anonymous namespace)::
maybe merge comphelper::IPropertyInfoService with frm::ConcreteInfoService, in
modules comphelper and forms
maybe merge comphelper::MasterPropertySet with SwXDocumentSettings, in modules
comphelper and sw
merge comphelper::MasterPropertySetInfo_Base with
comphelper::MasterPropertySetInfo
+merge comphelper::OAccessibleContextWrapperHelper with
comphelper::OAccessibleContextWrapper
maybe merge comphelper::OAccessibleSelectionHelper with
cppu::ImplInheritanceHelper, in modules comphelper and cppuhelper
maybe merge comphelper::OAccessibleTextHelper with
cppu::ImplInheritanceHelper, in modules comphelper and cppuhelper
merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper
commit 02971a09db764b255f89d1f632b576d7ca052fad
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 12 10:30:42 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 12 11:04:19 2025 +0100
unused "lock_" field in Components::WriteThread
ever since
commit a0ffaeeff972710a4172e7b4ee72610ad858c4df
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
Date: Mon Feb 10 14:38:33 2025 +0100
Shrink critical section into writeModFile
Change-Id: Iaa7e34182dffe485addc5b221953c938675375d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181469
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Jenkins
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index d40d04fbdb03..5716da7d4616 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -179,7 +179,6 @@ private:
std::mutex triggerMutex_;
std::condition_variable triggerCondition_;
bool triggered_;
- std::shared_ptr<osl::Mutex> lock_;
};
Components::WriteThread::WriteThread(
@@ -187,8 +186,7 @@ Components::WriteThread::WriteThread(
OUString url, Data const & data):
Thread("configmgrWriter"), reference_(reference), components_(components),
url_(std::move(url)), data_(data),
- triggered_(false),
- lock_( lock() )
+ triggered_(false)
{
assert(reference != nullptr);
}
