core.git: 2 commits - winaccessibility/source

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/AccImage.cxx |    9 +++------
 winaccessibility/source/UAccCOM/AccImage.h   |    5 -----
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 905270a2b483043e12c28806e3c4d3be850b479d
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Sep 17 08:55:45 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Sep 17 21:41:58 2024 +0200

    wina11y: Drop CAccImage::GetXInterface
    
    Just use the `m_xImage` member directly, as already
    happens just a few lines above.
    
    Change-Id: I00f7e871a2cb5eb301ba033944d8d529cc10bbae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173536
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx 
b/winaccessibility/source/UAccCOM/AccImage.cxx
index 1a37217529bd..c89b0423e09c 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -47,7 +47,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccImage::get_description(BSTR* description)
         if (!m_xImage.is())
             return E_FAIL;
 
-        OUString ouStr = GetXInterface()->getAccessibleImageDescription();
+        OUString ouStr = m_xImage->getAccessibleImageDescription();
         SysFreeString(*description);
         *description = sal::systools::BStr::newBSTR(ouStr);
 
diff --git a/winaccessibility/source/UAccCOM/AccImage.h 
b/winaccessibility/source/UAccCOM/AccImage.h
index 9e0e88d6e07a..fcfcd7177ccd 100644
--- a/winaccessibility/source/UAccCOM/AccImage.h
+++ b/winaccessibility/source/UAccCOM/AccImage.h
@@ -89,11 +89,6 @@ public:
 private:
 
     css::uno::Reference<css::accessibility::XAccessibleImage> m_xImage;
-
-    css::accessibility::XAccessibleImage* GetXInterface()
-    {
-        return m_xImage.get();
-    }
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 612e6aaa1f2d0b3603da686a0297193832511b3d
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Sep 17 08:52:17 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Sep 17 21:41:52 2024 +0200

    wina11y: Just assign the Reference
    
    Change-Id: Ibe0e9f1c8c6838044355db987d08298b267bed64
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173535
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx 
b/winaccessibility/source/UAccCOM/AccImage.cxx
index fbdcf6fa3ab2..1a37217529bd 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -95,11 +95,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccImage::put_XInterface(hyper pXInterface)
         {
             return E_FAIL;
         }
-        Reference<XAccessibleImage> pRXI(pRContext, UNO_QUERY);
-        if (!pRXI.is())
-            m_xImage = nullptr;
-        else
-            m_xImage = pRXI.get();
+        Reference<XAccessibleImage> xImage(pRContext, UNO_QUERY);
+        m_xImage = xImage;
         return S_OK;
     }
     catch (...)