ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix SbaXGridControl queryAggregation

Browse Source 
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 <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-01-20 10:16:32 +00:00
parent 53a809ac9c
commit 16f59f4b2b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbaccess/source/ui/browser/sbagrid.cxx
+2 -2
View File
@@ -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));
}
dbaccess/source/ui/inc/sbagrid.hxx
+2 -2
View File
@@ -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;