diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-20 15:01:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-20 17:18:27 +0000 |
| commit | 99ac0876bd2e9307c6edd4872a130d10436b0452 (patch) | |
| tree | 1fe8230f4c19d18fbb4cfce30164e018ec188db3 /UnoControls/source/inc/progressmonitor.hxx | |
| parent | 46f64f6df4a7e545114c4ec92598f6634d38b04b (diff) | |
Base BaseControl on WeakComponentImplHelper
...rather than on the deprecated OComponentHelper.
Various classes like BaseContainerControl, FrameControl, and ProgressBar, all
deriving from BaseControl, had been found to implement their respective
queryInterface in a way that is incompatible with the XAggregation protocol
inherited via OComponentHelper. It looks like no code actually made use of the
XAggregation offered by this class hierarchy, so the easiest fix for those
queryInterface implementations appears to switch from OComponentHelper to
WeakComponentImplHelper.
Ideally, BaseControl would derive from WeakComponentImplHelper<XServiceInfo,
XPaintListener, XWindowListener, ...> covering all the UNO interface classes
from which it currently derives manually. But changing that manual
implementation across the BaseControl class Hierarchy looks tricky, so merely
introduce an "empty" WeakComponentImplHelper<> for now and keep all the manual
stuff, and leave proper clean up for later.
Change-Id: I1aa8b06f78700008f844415818f4a5801daa89b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145902
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'UnoControls/source/inc/progressmonitor.hxx')
| -rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 90d1ffa18873..eaaa1bc80b3f 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -107,10 +107,6 @@ public: virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - // XAggregation - - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; - // XProgressMonitor /** |