diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
| commit | 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 (patch) | |
| tree | 63699b525800b2c6708e90b817853bb60be5f6d8 /sw/source/uibase/sidebar | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'sw/source/uibase/sidebar')
| -rw-r--r-- | sw/source/uibase/sidebar/SwPanelFactory.cxx | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index 4fc7d8d11b9a..cc7984077b0d 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -29,9 +29,11 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <rtl/ref.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> +#include <cppuhelper/supportsservice.hxx> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> @@ -41,8 +43,8 @@ using namespace css::uno; namespace { -typedef ::cppu::WeakComponentImplHelper1 < - css::ui::XUIElementFactory +typedef ::cppu::WeakComponentImplHelper < + css::ui::XUIElementFactory, css::lang::XServiceInfo > PanelFactoryInterfaceBase; class SwPanelFactory @@ -62,6 +64,18 @@ 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 + { return OUString("org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"); } + + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return cppu::supportsService(this, ServiceName); } + + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; SwPanelFactory::SwPanelFactory (void) |