[Libreoffice-commits] core.git: winaccessibility/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Mon Feb 3 19:30:13 UTC 2020
winaccessibility/source/UAccCOM/AccActionBase.cxx | 4 +-
winaccessibility/source/UAccCOM/AccTable.cxx | 16 +++++-----
winaccessibility/source/UAccCOM/MAccessible.cxx | 12 +++----
winaccessibility/source/service/AccContainerEventListener.cxx | 2 -
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit b3b7584a031118e51eefe3a1de2497639a96ef00
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Feb 3 16:48:03 2020 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Feb 3 20:29:35 2020 +0100
loplugin:redundantpointerops (clang-cl)
Change-Id: I5ce235a72aedc507dbb925db4927f291916716d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87893
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index be8a5bfbfe4d..e3a93ecedf84 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -166,7 +166,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccActionBase::get_keyBinding(
if( !binding.is() )
return E_FAIL;
- long nCount = binding.get()->getAccessibleKeyBindingCount();
+ long nCount = binding->getAccessibleKeyBindingCount();
*keyBinding = static_cast<BSTR*>(::CoTaskMemAlloc(nCount*sizeof(BSTR)));
@@ -177,7 +177,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccActionBase::get_keyBinding(
for( int index = 0;index < nCount;index++ )
{
auto const wString = comphelper::GetkeyBindingStrByXkeyBinding(
- binding.get()->getAccessibleKeyBinding(index));
+ binding->getAccessibleKeyBinding(index));
(*keyBinding)[index] = SysAllocString(o3tl::toW(wString.getStr()));
}
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 35d1f85718ef..25ecb2ea8496 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -660,7 +660,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectRow(long row)
Reference<XAccessibleTableSelection> pRTableExtent(pRXTable, UNO_QUERY);
if(pRTableExtent.is())
{
- pRTableExtent.get()->selectRow(row);
+ pRTableExtent->selectRow(row);
return S_OK;
}
else
@@ -676,7 +676,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectRow(long row)
for(lCol = 0; lCol < lColumnCount; lCol ++)
{
long lChildIndex = GetXInterface()->getAccessibleIndex(row, lCol);
- pRSelection.get()->selectAccessibleChild(lChildIndex);
+ pRSelection->selectAccessibleChild(lChildIndex);
}
return S_OK;
@@ -704,7 +704,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectColumn(long column)
Reference<XAccessibleTableSelection> pRTableExtent(GetXInterface(), UNO_QUERY);
if(pRTableExtent.is())
{
- pRTableExtent.get()->selectColumn(column);
+ pRTableExtent->selectColumn(column);
return S_OK;
}
else
@@ -720,7 +720,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectColumn(long column)
for(lRow = 0; lRow < lRowCount; lRow ++)
{
long lChildIndex = GetXInterface()->getAccessibleIndex(lRow, column);
- pRSelection.get()->selectAccessibleChild(lChildIndex);
+ pRSelection->selectAccessibleChild(lChildIndex);
}
return S_OK;
@@ -749,7 +749,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectRow(long row)
Reference<XAccessibleTableSelection> pRTableExtent(GetXInterface(), UNO_QUERY);
if(pRTableExtent.is())
{
- if(pRTableExtent.get()->unselectRow(row))
+ if(pRTableExtent->unselectRow(row))
return S_OK;
else
return E_FAIL;
@@ -767,7 +767,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectRow(long row)
for(lColumn = 0; lColumn < lColumnCount; lColumn ++)
{
long lChildIndex = GetXInterface()->getAccessibleIndex(row,lColumn);
- pRSelection.get()->deselectAccessibleChild(lChildIndex);
+ pRSelection->deselectAccessibleChild(lChildIndex);
}
return S_OK;
@@ -796,7 +796,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectColumn(long column)
Reference<XAccessibleTableSelection> pRTableExtent(GetXInterface(), UNO_QUERY);
if(pRTableExtent.is())
{
- if(pRTableExtent.get()->unselectColumn(column))
+ if(pRTableExtent->unselectColumn(column))
return S_OK;
else
return E_FAIL;
@@ -815,7 +815,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectColumn(long column)
for(lRow = 0; lRow < lRowCount; lRow ++)
{
long lChildIndex = GetXInterface()->getAccessibleIndex(lRow, column);
- pRSelection.get()->deselectAccessibleChild(lChildIndex);
+ pRSelection->deselectAccessibleChild(lChildIndex);
}
return S_OK;
}
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index dde93ec9f18d..c691f604faac 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1666,7 +1666,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_nRelations( long __RPC_FAR *
if (!m_xContext.is())
return E_FAIL;
Reference<XAccessibleRelationSet> pRrelationSet =
- m_xContext.get()->getAccessibleRelationSet();
+ m_xContext->getAccessibleRelationSet();
if(!pRrelationSet.is())
{
*nRelations = 0;
@@ -1709,7 +1709,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_relation( long relationIndex
if( relationIndex < nMax )
{
Reference<XAccessibleRelationSet> const pRrelationSet =
- m_xContext.get()->getAccessibleRelationSet();
+ m_xContext->getAccessibleRelationSet();
if(!pRrelationSet.is())
{
@@ -1759,7 +1759,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_relations( long, IAccessible
return E_FAIL;
Reference<XAccessibleRelationSet> const pRrelationSet =
- m_xContext.get()->getAccessibleRelationSet();
+ m_xContext->getAccessibleRelationSet();
if(!pRrelationSet.is())
{
*nRelations = 0;
@@ -3047,7 +3047,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_states(AccessibleStates __R
return E_FAIL;
Reference<XAccessibleStateSet> const pRStateSet =
- m_xContext.get()->getAccessibleStateSet();
+ m_xContext->getAccessibleStateSet();
if(!pRStateSet.is())
{
return S_OK;
@@ -3108,7 +3108,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_indexInParent( long __RPC_F
if (!m_xContext.is())
return E_FAIL;
- *accParentIndex = m_xContext.get()->getAccessibleIndexInParent();
+ *accParentIndex = m_xContext->getAccessibleIndexInParent();
return S_OK;
@@ -3124,7 +3124,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_locale( IA2Locale __RPC_FAR
if (!m_xContext.is())
return E_FAIL;
- css::lang::Locale unoLoc = m_xContext.get()->getLocale();
+ css::lang::Locale unoLoc = m_xContext->getLocale();
locale->language = SysAllocString(o3tl::toW(unoLoc.Language.getStr()));
locale->country = SysAllocString(o3tl::toW(unoLoc.Country.getStr()));
locale->variant = SysAllocString(o3tl::toW(unoLoc.Variant.getStr()));
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index 36f5e12b80fa..9587255acd28 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -369,7 +369,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
//for editable combobox, send focus event on only edit control,
bool bSendFocusOnCombobox = true;
//send focused event to the first text child
- Reference<XAccessibleContext> mxContext = m_xAccessible.get()->getAccessibleContext();
+ Reference<XAccessibleContext> mxContext = m_xAccessible->getAccessibleContext();
if(mxContext.is())
{
Reference<XAccessible> mxChild = mxContext->getAccessibleChild(0);
More information about the Libreoffice-commits
mailing list