[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/inc sw/source

[Tomaž Vajngerl (via logerrit)]

 sw/inc/OnlineAccessibilityCheck.hxx                 |    8 ++++----
 sw/source/core/txtnode/OnlineAccessibilityCheck.cxx |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0f2e76b726672fcd4af1ebba5d70b44b9bc99a9f
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Nov 16 18:04:34 2022 +0900
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Fri Feb 17 08:59:10 2023 +0000

    sw: rename WeakContentNodeContainer to WeakNodeContainer
    
    Change-Id: Ic80c0753b600ff6e846f2f38a1c46cb67763e2fc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142820
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    (cherry picked from commit bada1fc45d6ec65c12cf9ed36e15927b27d6d49c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144500
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/inc/OnlineAccessibilityCheck.hxx 
b/sw/inc/OnlineAccessibilityCheck.hxx
index e87f24d61d44..8f52b73f35bd 100644
--- a/sw/inc/OnlineAccessibilityCheck.hxx
+++ b/sw/inc/OnlineAccessibilityCheck.hxx
@@ -24,14 +24,14 @@ namespace sw
 {
 /// Contains the node and tracks if the node gets deleted.
 /// Note: the node needs to extend sw::BroadcastingModify.
-class WeakContentNodeContainer : public SvtListener
+class WeakNodeContainer : public SvtListener
 {
 private:
     SwNode* m_pNode;
 
 public:
-    WeakContentNodeContainer(SwNode* pNode);
-    ~WeakContentNodeContainer();
+    WeakNodeContainer(SwNode* pNode);
+    ~WeakNodeContainer();
 
     /// Is the node still alive or it was deleted?
     bool isAlive();
@@ -44,7 +44,7 @@ public:
 class OnlineAccessibilityCheck : public SvtListener
 {
 private:
-    std::map<SwNode*, std::unique_ptr<WeakContentNodeContainer>> m_aNodes;
+    std::map<SwNode*, std::unique_ptr<WeakNodeContainer>> m_aNodes;
 
     SwDoc& m_rDocument;
     sw::AccessibilityCheck m_aAccessibilityCheck;
diff --git a/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx 
b/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
index 97f63c7276ab..682fde13cceb 100644
--- a/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
+++ b/sw/source/core/txtnode/OnlineAccessibilityCheck.cxx
@@ -29,7 +29,7 @@
 
 namespace sw
 {
-WeakContentNodeContainer::WeakContentNodeContainer(SwNode* pNode)
+WeakNodeContainer::WeakNodeContainer(SwNode* pNode)
     : m_pNode(pNode)
 {
     if (m_pNode)
@@ -43,16 +43,16 @@ WeakContentNodeContainer::WeakContentNodeContainer(SwNode* 
pNode)
     }
 }
 
-WeakContentNodeContainer::~WeakContentNodeContainer() { EndListeningAll(); }
+WeakNodeContainer::~WeakNodeContainer() { EndListeningAll(); }
 
-bool WeakContentNodeContainer::isAlive()
+bool WeakNodeContainer::isAlive()
 {
     if (!HasBroadcaster())
         m_pNode = nullptr;
     return m_pNode;
 }
 
-SwNode* WeakContentNodeContainer::getNode()
+SwNode* WeakNodeContainer::getNode()
 {
     if (isAlive())
         return m_pNode;
@@ -81,7 +81,7 @@ void OnlineAccessibilityCheck::updateNodeStatus(SwNode* pNode)
     auto it = m_aNodes.find(pNode);
     if (it == m_aNodes.end())
     {
-        m_aNodes.emplace(pNode, 
std::make_unique<WeakContentNodeContainer>(pNode));
+        m_aNodes.emplace(pNode, std::make_unique<WeakNodeContainer>(pNode));
     }
 
     for (auto iterator = m_aNodes.begin(); iterator != m_aNodes.end();)