[Libreoffice-commits] core.git: 2 commits - reportdesign/source svx/source

[Stephan Bergmann]

Ouch.  I must admit I at least didn't carefully inspect all of the 
supportsService implementations cleaned up in 
<https://bugs.freedesktop.org/show_bug.cgi?id=54938> "Adapt 
supportsService implementations to cppu::supportsService" for this 
gotcha of deliberate incompatibility between supportsService and 
getSupportedServiceNames.

Would it not be better here to change OShape::getSupportedServiceNames 
instead, to also report m_sServiceName?

Stephan

On 11/08/2013 03:10 AM, Lionel Elie Mamane wrote:
> commit e7fad6da680631f82684d4f248ab77d53caa4189
> Author: Lionel Elie Mamane <lionel at mamane.lu>
> Date:   Fri Nov 8 03:06:09 2013 +0100
>
>      fdo#71130 pretend to support service m_sServiceName
>
>      Which was the case before, and was probably erroneously changed in
>      commit 196f980012739d94654e6863b85b2e49f7e1a1e5
>          fdo#54938: Replace existsValue for cppu::supportsService
>
>      Change-Id: I20323bba1105d1844c79a5a0ad3c9e133a9d0d05
>
> diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
> index 47270d4..d22ed65 100644
> --- a/reportdesign/source/core/api/Shape.cxx
> +++ b/reportdesign/source/core/api/Shape.cxx
> @@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(un
>   sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
>   {
>
> -    return cppu::supportsService(this, ServiceName);
> +    return m_sServiceName == ServiceName || cppu::supportsService(this, ServiceName);
>   }
>   // -----------------------------------------------------------------------------
>   // XReportComponent