winaccessibility/source/UAccCOM/MAccessible.cxx | 31 +++++++---------
winaccessibility/source/service/AccObjectWinManager.cxx | 2 -
2 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit e127d6e49a0a1b59e49112d354ddc2ae67e35045
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 24 07:59:46 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 24 11:38:58 2025 +0200
wina11y: Use Ref instead of extra raw pointer
In addition, rename `pRXI` according to naming scheme
(starting with `x` as it is an rtl::Reference).
Change-Id: Ib699957a35b3f49606c8196f5d7350cf27b71da9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184531
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 3d3526938bf9..040aa47aeee1 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2657,13 +2657,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_attributes(/*[out]*/ BSTR *p
}
OUString sAttributes;
- Reference<XAccessibleExtendedAttributes> pRXI(pRContext,UNO_QUERY);
- if (pRXI.is())
+ Reference<XAccessibleExtendedAttributes>
xExtendedAttributes(pRContext, UNO_QUERY);
+ if (xExtendedAttributes.is())
{
-
css::uno::Reference<css::accessibility::XAccessibleExtendedAttributes> pRXAttr;
- pRXAttr = pRXI.get();
-
- const OUString val = pRXAttr->getExtendedAttributes();
+ const OUString val = xExtendedAttributes->getExtendedAttributes();
sAttributes += val;
}
commit faf94529a0474488f1c80b3126f7d7c3e5cb1a69
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 24 07:56:40 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 24 11:38:52 2025 +0200
wina11y: Drop redundant 'this->'
Change-Id: I7c0c09788499d5299820f600e2861bc124c68fed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184530
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 9d0c9485dfc5..3d3526938bf9 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -391,7 +391,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accName(VARIANT varChild, BS
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accName(varChild,pszName);
@@ -436,7 +436,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accValue(VARIANT varChild, B
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accValue(varChild,pszValue);
@@ -483,7 +483,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accDescription(VARIANT varCh
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accDescription(varChild,pszDescription);
@@ -530,7 +530,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accRole(VARIANT varChild, VA
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accRole(varChild,pvarRole);
@@ -590,7 +590,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accState(VARIANT varChild, V
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accState(varChild,pvarState);
@@ -782,7 +782,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_accKeyboardShortcut(VARIANT
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
@@ -1073,7 +1073,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::put_accValue(VARIANT varChild, B
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->put_accValue(varChild,szValue);
@@ -1222,7 +1222,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::Put_XAccParent(IMAccessible __RP
{
// internal IMAccessible - no mutex meeded
- this->m_pIParent = pIParent;
+ m_pIParent = pIParent;
if(pIParent)
m_pIParent->AddRef();
@@ -1239,7 +1239,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::Put_XAccChildID(long dChildID)
{
// internal IMAccessible - no mutex meeded
- this->m_dChildID = dChildID;
+ m_dChildID = dChildID;
return S_OK;
}
@@ -2181,7 +2181,7 @@ COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE
CMAccessible::get_accDefaultActio
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->get_accDefaultAction(varChild,pszDefaultAction);
@@ -2217,7 +2217,7 @@ COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE
CMAccessible::accDoDefaultAction(
long lVal = varChild.lVal;
varChild.lVal = CHILDID_SELF;
- IMAccessible *pChild = this->GetChildInterface(lVal);
+ IMAccessible* pChild = GetChildInterface(lVal);
if(!pChild)
return E_FAIL;
return pChild->accDoDefaultAction( varChild );
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx
b/winaccessibility/source/service/AccObjectWinManager.cxx
index 918a6fa47155..f2253eae59e1 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -633,7 +633,7 @@ bool AccObjectWinManager::InsertAccObj( XAccessible*
pXAcc,XAccessible* pParentX
}
AccObject pObj(pXAcc, this);
- pObj.SetResID( this->ImpleGenerateResID());
+ pObj.SetResID(ImpleGenerateResID());
pObj.SetParentHWND( pWnd );
//for file name support
