helpcontent2 | 2 +-
svx/source/accessibility/ChildrenManagerImpl.cxx | 10 +++-------
svx/source/accessibility/ChildrenManagerImpl.hxx | 7 +++----
3 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit cf6976280f5371c01251c0ffce206535433207a3
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Dec 24 13:57:59 2021 -0300
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Fri Dec 24 17:57:59 2021 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to 215707177c272f9fcf73a79b9150fe677b991716
- Refactor database files
Change-Id: If6acf26ea094234d06522c26c8bb8274c0abdaa5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127430
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/helpcontent2 b/helpcontent2
index a35f8b648fd4..215707177c27 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a35f8b648fd4bac70bbde0554a2d4051c7633cde
+Subproject commit 215707177c272f9fcf73a79b9150fe677b991716
commit a3af03ec84ff5e8a89ccfa6fb2350eec6f09883c
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 24 12:00:57 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 24 17:57:41 2021 +0100
use comphelper::WeakComponentImplHelper in ChildrenManagerImpl
Change-Id: I24b1f497a77b7ff896060a8f7dacc5d3a5e27ea2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127411
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx
b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 2b8f5674b0d9..080d2a204b9d 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -69,10 +69,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
const uno::Reference<drawing::XShapes>& rxShapeList,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
AccessibleContextBase& rContext)
- : ::cppu::WeakComponentImplHelper<
- css::document::XEventListener,
- css::view::XSelectionChangeListener>(m_aMutex),
- mxShapeList (rxShapeList),
+ : mxShapeList (rxShapeList),
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
mrContext (rContext),
@@ -83,8 +80,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
ChildrenManagerImpl::~ChildrenManagerImpl()
{
- DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose,
- "~AccessibleDrawDocumentView: object has not been disposed");
+ DBG_ASSERT (m_bDisposed, "~AccessibleDrawDocumentView: object has not been
disposed");
}
@@ -694,7 +690,7 @@ void ChildrenManagerImpl::impl_dispose()
}
-void SAL_CALL ChildrenManagerImpl::disposing()
+void ChildrenManagerImpl::disposing()
{
impl_dispose();
}
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx
b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 1956a7650fc4..6cd9a76305b5 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -24,7 +24,7 @@
#include <svx/IAccessibleParent.hxx>
#include <svx/AccessibleShapeTreeInfo.hxx>
#include <editeng/AccessibleContextBase.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <tools/gen.hxx>
#include <vector>
#include <com/sun/star/drawing/XShape.hpp>
@@ -72,8 +72,7 @@ typedef ::std::vector<ChildDescriptor>
ChildDescriptorListType;
@see ChildrenManager
*/
class ChildrenManagerImpl final
- : public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper<
+ : public comphelper::WeakComponentImplHelper<
css::document::XEventListener,
css::view::XSelectionChangeListener>,
public IAccessibleViewForwarderListener,
@@ -316,7 +315,7 @@ private:
/** This method is called from the component helper base class while
disposing.
*/
- virtual void SAL_CALL disposing() override;
+ virtual void disposing() override;
void impl_dispose();
