core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 217dd12214f6e743327ade178a82489263bf5115
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Apr 25 14:16:16 2024 +0200
Commit:     Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:20:27 2024 +0200

    Adapt queryInterface in fixed msvc_win32_arm64 UNO bridge
    
    ...where the function's argument is in x2, not x1 (see commit message of
    ae6ee262d7649222a137f8722886a10db274ddf5 "Some fixing of msvc_win32_arm64 
UNO
    bridge" for details)
    
    Change-Id: I00ef5df1ebad4609918c0c6845ebdcfe810f6152
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166622
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174222
    Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
    Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index da8694667b3c..a43cd3e24698 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -290,7 +290,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
                 {
                     typelib_TypeDescription* td = nullptr;
                     TYPELIB_DANGER_GET(&td,
-                                       
(reinterpret_cast<uno::Type*>(gpr[1])->getTypeLibType()));
+                                       
(reinterpret_cast<uno::Type*>(gpr[2])->getTypeLibType()));
                     if (td != 0 && td->eTypeClass == 
typelib_TypeClass_INTERFACE)
                     {
                         uno::XInterface* ifc = nullptr;