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

[Mehmet Emin BaÅŸoÄŸlu (via logerrit)]

 reportdesign/source/core/sdr/RptObject.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 91a3411bb74ad81663a4204f4547c523a1237f7b
Author:     Mehmet Emin Başoğlu <mehmeteminbasoglu at hotmail.com>
AuthorDate: Mon Jan 27 11:44:37 2020 +0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 7 13:34:45 2020 +0100

    tdf#54938: Adapt supportsService implementations to cppu::supportsService
    
    Change-Id: I5484047a8b0e87d012ca3a37466b9ebf718257b8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87494
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 64399bd9117c..ab478828dd7d 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -425,14 +425,13 @@ void OObjectBase::_propertyChange( const  beans::PropertyChangeEvent& /*evt*/ )
 
 bool OObjectBase::supportsService( const OUString& _sServiceName ) const
 {
-    bool bSupports = false;
-
+    // TODO: cache xServiceInfo as member?
     Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , UNO_QUERY );
-        // TODO: cache xServiceInfo as member?
-    if ( xServiceInfo.is() )
-        bSupports = xServiceInfo->supportsService( _sServiceName );
 
-    return bSupports;
+    if ( xServiceInfo.is() )
+        return cppu::supportsService(xServiceInfo.get(), _sServiceName);
+    else
+        return false;
 }