summaryrefslogtreecommitdiff
path: root/winaccessibility/inc
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2023-12-08 13:05:23 +0000
committerMichael Weghorn <m.weghorn@posteo.de>2023-12-08 17:26:39 +0100
commit5100fb1c0ebadf936bc86b60cb8870095003e8ce (patch)
tree0519e3bbcd071af2bd2a665334b637cb1b845895 /winaccessibility/inc
parent9924561a094f1b3b2b78700bd1f1638d9608f881 (diff)
wina11y: Hold AccObjectWinManager by ref, not ptr
Inspired by commit 0a2622760a967e9d64cfdc632548dd42c1836324 Date: Wed Nov 8 13:54:14 2023 +0100 Drop presumably redundant null check Change-Id: Icb2bfb83ebf4146eb3091a6021ecac75aa6626b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160464 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility/inc')
-rw-r--r--winaccessibility/inc/AccComponentEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccContainerEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccDescendantManagerEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccDialogEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccEventListener.hxx6
-rw-r--r--winaccessibility/inc/AccFrameEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccListEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccMenuEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccObjectContainerEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccParagraphEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccTableEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccTextComponentEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccTreeEventListener.hxx2
-rw-r--r--winaccessibility/inc/AccWindowEventListener.hxx2
14 files changed, 16 insertions, 16 deletions
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 72666b2a5690..ae99438336a6 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -36,7 +36,7 @@ class AccComponentEventListener : public AccEventListener
private:
static FILE *output, *output2, *output3, *outacc; //used for debugging
public:
- AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccComponentEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index e6d284e75ad2..f15379db3462 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -39,7 +39,7 @@ enum class UnoMSAAEvent;
class AccContainerEventListener: public AccEventListener
{
public:
- AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccContainerEventListener() override;
//AccessibleEventListener
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index f910c2e6447b..1c7bc16252aa 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -39,7 +39,7 @@ private:
std::vector<com::sun::star::accessibility::XAccessible*> m_aUnselectedChildrenForDeletion;
public:
- AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccDescendantManagerEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index 8f47fa94ab4e..931504a9bb2a 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -33,7 +33,7 @@
class AccDialogEventListener : public AccEventListener
{
public:
- AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccDialogEventListener() override;
//AccessibleEventListener
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index e9dd0e64be2f..bf8841125d95 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -36,11 +36,11 @@ class AccEventListener : public ::cppu::WeakImplHelper<css::accessibility::XAcce
protected:
//accessible owner's pointer
css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
- // pointer for object's manager
- AccObjectWinManager* m_pObjManager;
+ // reference to object's manager
+ AccObjectWinManager& m_rObjManager;
public:
- AccEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccEventListener() override;
// XEventListener
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index b575b57f50bd..721588c428eb 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -33,7 +33,7 @@
class AccFrameEventListener : public AccEventListener
{
public:
- AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccFrameEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index eb9911308d81..d7dec49e54df 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -33,7 +33,7 @@
class AccListEventListener : public AccDescendantManagerEventListener
{
public:
- AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccListEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index fbe4eb2900c2..20bd70335752 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -33,7 +33,7 @@
class AccMenuEventListener : public AccComponentEventListener
{
public:
- AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccMenuEventListener() override;
//AccessibleEventListener
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index 37ab738068da..10e246f2cd2f 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -34,7 +34,7 @@
class AccObjectContainerEventListener: public AccContainerEventListener
{
public:
- AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccObjectContainerEventListener() override;
virtual void HandleStateChangedEvent(
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index d2f5457e1b0c..ae13bdc6bb3a 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -33,7 +33,7 @@
class AccParagraphEventListener : public AccContainerEventListener
{
public:
- AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccParagraphEventListener() override;
//AccessibleEventListener
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index ee0738f21a35..16179feff371 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -33,7 +33,7 @@
class AccTableEventListener : public AccDescendantManagerEventListener
{
public:
- AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccTableEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index d4b78bcd300f..2b7eb811d7b8 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -34,7 +34,7 @@ class AccTextComponentEventListener : public AccComponentEventListener
{
public:
AccTextComponentEventListener(css::accessibility::XAccessible* pAcc,
- AccObjectWinManager* pManager);
+ AccObjectWinManager& rManager);
virtual ~AccTextComponentEventListener() override;
virtual void SetComponentState(sal_Int64 state, bool enable) override;
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index cb6551db448e..f5dd471625aa 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -33,7 +33,7 @@
class AccTreeEventListener : public AccDescendantManagerEventListener
{
public:
- AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccTreeEventListener() override;
// XAccessibleEventListener
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index 595f34099090..7f3c57a8870c 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -33,7 +33,7 @@
class AccWindowEventListener : public AccEventListener
{
public:
- AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager* pManager);
+ AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager);
virtual ~AccWindowEventListener() override;
// XAccessibleEventListener