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 /forms/source/inc | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'forms/source/inc')
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 7 | ||||
| -rw-r--r-- | forms/source/inc/forms_module.hxx | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 91ecc23f7efb..abf8956ae772 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -84,12 +84,7 @@ namespace frm #define DECLARE_XPERSISTOBJECT() \ virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - - // old macro for quickly implementing XServiceInfo::getImplementationName - #define IMPLEMENTATION_NAME(ImplName) \ - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ - { return OUString("com.sun.star.comp.forms." #ImplName); } + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; class OControlModel; diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index cf72d01cb0e6..98bdf7344438 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -198,7 +198,7 @@ namespace FORMS_MODULE_NAMESPACE \ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException, std::exception) \ { \ - return ::comphelper::concatSequences( \ + return ::comphelper::combineSequences( \ getAggregateServiceNames(), \ getSupportedServiceNames_Static() \ ); \ @@ -273,7 +273,7 @@ namespace FORMS_MODULE_NAMESPACE aOwnNames[ 4 ] = service5; \ aOwnNames[ 5 ] = service6; \ aOwnNames[ 6 ] = service7; \ - aOwnNames[ 6 ] = service8; \ + aOwnNames[ 7 ] = service8; \ \ return ::comphelper::concatSequences( \ baseclass::getSupportedServiceNames_Static(), \ |