ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

[API CHANGE] Pass XAccessible to XAccessibleGroupPosition::getObjectLink

Browse Source 
Similar to previous commit

    Change-Id: I5db3a99bb8d78099e3b136cbcd402fe2ae49d49c
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Sat Sep 19 13:12:54 2026 +0200

        [API CHANGE] Pass XAccessible to XAccessibleGroupPosition::getGroupPosition

, also pass an XAccessible instead of a uno::Any to
XAccessibleGroupPosition::getObjectLink.

See the above-mentioned commit for more background.

Change-Id: I8440b91eff66a18bc6e431a0ad91362e895d945c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211217
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2026-09-20 22:24:29 +02:00
parent a19da3e1cd
commit 25eea781f0
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/svx/AccessibleShape.hxx
+2 -1
View File
@@ -130,7 +130,8 @@ public:
//===== XAccessibleGroupPosition =========================================
virtual css::uno::Sequence<sal_Int32> SAL_CALL getGroupPosition(
const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override;
virtual OUString SAL_CALL getObjectLink(
const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
/** The destructor releases its children manager and text engine if
still existent. These are responsible to send appropriate events.
*/
offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl
+1 -1
View File
@@ -25,7 +25,7 @@ interface XAccessibleGroupPosition : ::com::sun::star::uno::XInterface
sequence<long> getGroupPosition( [in] XAccessible accObject ) raises (::com::sun::star::lang::IndexOutOfBoundsException);
/* Returns the hyperlink URL info of the object */
string getObjectLink( [in] any accoject ) raises (::com::sun::star::lang::IndexOutOfBoundsException);
string getObjectLink( [in] XAccessible accObject ) raises (::com::sun::star::lang::IndexOutOfBoundsException);
};
}; }; }; };
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+4 -5
View File
@@ -456,19 +456,18 @@ uno::Sequence<sal_Int32> SAL_CALL AccessibleDrawDocumentView::getGroupPosition(
return aRet;
}
OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
OUString AccessibleDrawDocumentView::getObjectLink(
const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
{
SolarMutexGuard g;
OUString aRet;
//get the xShape of the current selected drawing object
uno::Reference<XAccessibleContext> xAccContent;
rAny >>= xAccContent;
if ( !xAccContent.is() )
if (!rxAccessible.is())
{
return aRet;
}
AccessibleShape* pAcc = comphelper::getFromUnoTunnel<AccessibleShape>( xAccContent );
AccessibleShape* pAcc = comphelper::getFromUnoTunnel<AccessibleShape>(rxAccessible);
if ( !pAcc )
{
return aRet;
sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+2 -1
View File
@@ -81,7 +81,8 @@ public:
//===== XAccessibleGroupPosition =========================================
virtual css::uno::Sequence<sal_Int32> SAL_CALL getGroupPosition(
const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override;
virtual OUString SAL_CALL getObjectLink(
const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
private:
svx/source/accessibility/AccessibleShape.cxx
+2 -2
View File
@@ -1084,7 +1084,7 @@ AccessibleShape::getGroupPosition(const css::uno::Reference<css::accessibility::
return aRet;
}
OUString AccessibleShape::getObjectLink( const uno::Any& )
OUString AccessibleShape::getObjectLink(const css::uno::Reference<css::accessibility::XAccessible>&)
{
OUString aRet;
@@ -1098,7 +1098,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& )
Reference< XAccessibleGroupPosition > xGroupPosition( maShapeTreeInfo.GetDocumentWindow(), uno::UNO_QUERY );
if (xGroupPosition.is())
{
aRet = xGroupPosition->getObjectLink( uno::Any( getAccessibleContext() ) );
aRet = xGroupPosition->getObjectLink(this);
}
}
return aRet;