From 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 17 Mar 2015 12:25:11 +0100
Subject: Fix various XServiceInfo implementations

...to match what is recorded in the .component files

Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
---
 sc/inc/ScPanelFactory.hxx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'sc/inc')

diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
index 8a0c704f3337..69af4f086e26 100644
--- a/sc/inc/ScPanelFactory.hxx
+++ b/sc/inc/ScPanelFactory.hxx
@@ -19,9 +19,10 @@
 #ifndef INCLUDED_SC_INC_SCPANELFACTORY_HXX
 #define INCLUDED_SC_INC_SCPANELFACTORY_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -30,8 +31,8 @@ namespace sc { namespace sidebar {
 
 namespace
 {
-    typedef ::cppu::WeakComponentImplHelper1 <
-        css::ui::XUIElementFactory
+    typedef ::cppu::WeakComponentImplHelper <
+        css::ui::XUIElementFactory, css::lang::XServiceInfo
         > PanelFactoryInterfaceBase;
 }
 
@@ -41,10 +42,10 @@ class ScPanelFactory
       public PanelFactoryInterfaceBase
 {
 public:
-    static ::rtl::OUString SAL_CALL getImplementationName(void);
+    static ::rtl::OUString SAL_CALL getImplementationName_static();
     static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance(
         const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory);
-    static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(void);
+    static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_static();
 
     ScPanelFactory(void);
     virtual ~ScPanelFactory(void);
@@ -57,6 +58,15 @@ public:
             css::container::NoSuchElementException,
             css::lang::IllegalArgumentException,
             css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 } } // end of namespace sc::sidebar
-- 
cgit