winaccessibility/source/UAccCOM/AccEditableText.cxx | 14 +++++++-------
winaccessibility/source/UAccCOM/AccEditableText.h | 2 --
winaccessibility/source/UAccCOM/AccHyperLink.cxx | 17 ++++++-----------
winaccessibility/source/UAccCOM/AccHyperLink.h | 4 ++--
4 files changed, 15 insertions(+), 22 deletions(-)
New commits:
commit cdd0af36f4057a8750992d7b4a82cd0e50183d04
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Sep 17 08:42:25 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Sep 17 21:41:25 2024 +0200
wina11y: Just assign the Reference
Change-Id: I8ca9cd55723b1775284b23e13db409fc5d47005c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173531
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
index 7ef2162e3969..49762671fcc4 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
@@ -272,12 +272,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccHyperLink::put_XInterface(hyper pXInterfac
return E_FAIL;
}
Reference<XAccessibleHyperlink> pRXI(pRContext, UNO_QUERY);
- if (!pRXI.is())
- {
- m_xHyperlink = nullptr;
- }
- else
- m_xHyperlink = pRXI.get();
+ m_xHyperlink = pRXI;
}
return S_OK;
}
commit e22172ebed6f019a153e485b4bda64e6b6859b2d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Sep 17 08:39:54 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Sep 17 21:41:19 2024 +0200
wina11y: Rename CAccHyperLink::{pRXLink -> m_xHyperlink}
Adhere to naming conventions to make clearer that this
is a class member, and a `uno::Reference`.
Change-Id: I29caf6ad2d0adcfca430df72c2638dbd4ee06f1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173530
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
index 388058abaec7..7ef2162e3969 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
@@ -111,7 +111,7 @@ CAccHyperLink::get_anchor(/* [in] */ long index,
return E_INVALIDARG;
}
- if (!pRXLink.is())
+ if (!m_xHyperlink.is())
{
return E_FAIL;
}
@@ -146,7 +146,7 @@ CAccHyperLink::get_anchorTarget(/* [in] */ long index,
return E_INVALIDARG;
}
- if (!pRXLink.is())
+ if (!m_xHyperlink.is())
{
return E_FAIL;
}
@@ -206,7 +206,7 @@ CAccHyperLink::get_endIndex(/* [retval][out] */ long
__RPC_FAR* index)
return E_INVALIDARG;
}
- if (!pRXLink.is())
+ if (!m_xHyperlink.is())
{
return E_FAIL;
}
@@ -237,7 +237,7 @@ CAccHyperLink::get_valid(/* [retval][out] */ boolean
__RPC_FAR* valid)
return E_INVALIDARG;
}
- if (!pRXLink.is())
+ if (!m_xHyperlink.is())
{
return E_FAIL;
}
@@ -274,10 +274,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccHyperLink::put_XInterface(hyper pXInterfac
Reference<XAccessibleHyperlink> pRXI(pRContext, UNO_QUERY);
if (!pRXI.is())
{
- pRXLink = nullptr;
+ m_xHyperlink = nullptr;
}
else
- pRXLink = pRXI.get();
+ m_xHyperlink = pRXI.get();
}
return S_OK;
}
@@ -296,7 +296,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccHyperLink::put_XSubInterface(hyper pXSubIn
{
// internal IUNOXWrapper - no mutex meeded
- pRXLink = reinterpret_cast<XAccessibleHyperlink*>(pXSubInterface);
+ m_xHyperlink = reinterpret_cast<XAccessibleHyperlink*>(pXSubInterface);
pRXAct = reinterpret_cast<XAccessibleAction*>(pXSubInterface);
return S_OK;
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h
b/winaccessibility/source/UAccCOM/AccHyperLink.h
index aa425be0fd62..fd343c863fb3 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.h
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.h
@@ -122,9 +122,9 @@ public:
STDMETHOD(put_XSubInterface)(hyper pXSubInterface) override;
private:
- css::uno::Reference<css::accessibility::XAccessibleHyperlink> pRXLink;
+ css::uno::Reference<css::accessibility::XAccessibleHyperlink> m_xHyperlink;
- css::accessibility::XAccessibleHyperlink* GetXInterface() { return
pRXLink.get(); }
+ css::accessibility::XAccessibleHyperlink* GetXInterface() { return
m_xHyperlink.get(); }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 76cc9a987e5d5b2cdab302280c243e72d5905957
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Sep 17 08:37:46 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Sep 17 21:41:13 2024 +0200
wina11y: Drop CAccEditableText::GetXInterface
Be consistent and just use CAccEditableText::mxEditableText
directly, as already happens in each of the methods just
a few lines further up.
Change-Id: I70637714623f0410a60778e7bc1f4b007e034ddf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173529
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx
b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index a13343d5330a..6778ba748bb4 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -59,7 +59,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::copyText(long startOffset, l
return E_FAIL;
}
- if (GetXInterface()->copyText(startOffset, endOffset))
+ if (m_xEditableText->copyText(startOffset, endOffset))
return S_OK;
return E_FAIL;
@@ -86,7 +86,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::deleteText(long startOffset,
if (!m_xEditableText.is())
return E_FAIL;
- if (GetXInterface()->deleteText(startOffset, endOffset))
+ if (m_xEditableText->deleteText(startOffset, endOffset))
return S_OK;
return E_FAIL;
@@ -118,7 +118,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::insertText(long offset, BSTR
OUString ouStr(o3tl::toU(*text));
- if (GetXInterface()->insertText(ouStr, offset))
+ if (m_xEditableText->insertText(ouStr, offset))
return S_OK;
return E_FAIL;
@@ -145,7 +145,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::cutText(long startOffset, lo
if (!m_xEditableText.is())
return E_FAIL;
- if (GetXInterface()->cutText(startOffset, endOffset))
+ if (m_xEditableText->cutText(startOffset, endOffset))
return S_OK;
return E_FAIL;
@@ -171,7 +171,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::pasteText(long offset)
if (!m_xEditableText.is())
return E_FAIL;
- if (GetXInterface()->pasteText(offset))
+ if (m_xEditableText->pasteText(offset))
return S_OK;
return E_FAIL;
@@ -204,7 +204,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::replaceText(long startOffset
OUString ouStr(o3tl::toU(*text));
- if (GetXInterface()->replaceText(startOffset, endOffset, ouStr))
+ if (m_xEditableText->replaceText(startOffset, endOffset, ouStr))
return S_OK;
return E_FAIL;
}
@@ -255,7 +255,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccEditableText::setAttributes(long startOffs
}
}
- if (GetXInterface()->setAttributes(startOffset, endOffset, beanSeq))
+ if (m_xEditableText->setAttributes(startOffset, endOffset, beanSeq))
return S_OK;
return E_FAIL;
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h
b/winaccessibility/source/UAccCOM/AccEditableText.h
index 25ee1d5537ba..6b8c86dda9af 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.h
+++ b/winaccessibility/source/UAccCOM/AccEditableText.h
@@ -99,8 +99,6 @@ private:
static void get_AnyFromOLECHAR(std::u16string_view ouName, const OUString&
ouValue,
css::uno::Any& rAny);
-
- css::accessibility::XAccessibleEditableText* GetXInterface() { return
m_xEditableText.get(); }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
