Simplify ProgressMonitor, StatusIndicator

Change-Id: I1c17fa54e865c2750407783adbb2f73c095dbbfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178094
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins

1 files changed, 5 insertions, 51 deletions

diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 46a4dc735484..cd7786a2d69b 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -50,63 +50,17 @@ struct IMPL_TextlistItem
     OUString sText;          /// Right site of textline in dialog
 };
 
-class ProgressMonitor final : public css::awt::XLayoutConstrains
-                        , public css::awt::XButton
-                        , public css::awt::XProgressMonitor
-                        , public BaseContainerControl
+using ProgressMonitor_BASE = cppu::ImplInheritanceHelper<BaseContainerControl,
+                                                         css::awt::XLayoutConstrains,
+                                                         css::awt::XButton,
+                                                         css::awt::XProgressMonitor>;
+class ProgressMonitor final : public ProgressMonitor_BASE
 {
 public:
     ProgressMonitor( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual ~ProgressMonitor() override;
 
-    //  XInterface
-
-    /**
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
-
-        @seealso    XInterface
-
-        @param      "rType" is the type of searched interface.
-
-        @return     Any     information about found interface
-
-        @onerror    A RuntimeException is thrown.
-    */
-
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
-
-    /**
-        @short      increment refcount
-        @seealso    XInterface
-        @seealso    release()
-        @onerror    A RuntimeException is thrown.
-    */
-
-    virtual void SAL_CALL acquire() noexcept override;
-
-    /**
-        @short      decrement refcount
-        @seealso    XInterface
-        @seealso    acquire()
-        @onerror    A RuntimeException is thrown.
-    */
-
-    virtual void SAL_CALL release() noexcept override;
-
-    //  XTypeProvider
-
-    /**
-        @short      get information about supported interfaces
-        @seealso    XTypeProvider
-        @return     Sequence of types of all supported interfaces
-
-        @onerror    A RuntimeException is thrown.
-    */
-
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
     //  XProgressMonitor
 
     /**