[Libreoffice-commits] core.git: dbaccess/source

[Stephan Bergmann (via logerrit)]

 dbaccess/source/ui/browser/sbagrid.cxx |    4 ++--
 dbaccess/source/ui/inc/sbagrid.hxx     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 16f59f4b2b50dbca353aa468512e7f704fa903ad
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 20 09:26:51 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 20 10:16:32 2023 +0000

    Fix SbaXGridControl queryAggregation
    
    The base UnoControl uses WeakAggImplHelper9, so (for better or worse) 
derives
    from XAggregation, but SbaXGridControl failed to properly implement the
    XAggregation protocol.
    
    Change-Id: I26c825b9b64b4e886e69f95bc3d4d5d42120bd8a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145865
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 9db34b530119..03b81526a372 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -127,9 +127,9 @@ rtl::Reference<FmXGridPeer> 
SbaXGridControl::imp_CreatePeer(vcl::Window* pParent
     return pReturn;
 }
 
-Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType)
+Any SAL_CALL SbaXGridControl::queryAggregation(const Type& _rType)
 {
-    Any aRet = FmXGridControl::queryInterface(_rType);
+    Any aRet = FmXGridControl::queryAggregation(_rType);
     return aRet.hasValue() ? aRet : 
::cppu::queryInterface(_rType,static_cast<css::frame::XDispatch*>(this));
 }
 
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx 
b/dbaccess/source/ui/inc/sbagrid.hxx
index 5dbffa6717a2..22af70834425 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -62,8 +62,8 @@ namespace dbaui
         virtual ~SbaXGridControl() override;
 
         // UNO
-        DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl)
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& 
_rType) override;
+        DECLARE_UNO3_AGG_DEFAULTS(SbaXGridControl, FmXGridControl)
+        virtual css::uno::Any  SAL_CALL queryAggregation(const css::uno::Type& 
_rType) override;
 
         // XTypeProvider
         virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) 
override;