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

Stephan Bergmann sbergman at redhat.com
Fri Mar 28 06:31:04 PDT 2014


 chart2/source/tools/RegressionEquation.hxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit c7190108f02921868cb617040aebdb2d22c02c1f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 28 14:30:30 2014 +0100

    Missing XServiceInfo base class
    
    Change-Id: I2a233e60162fd89e4765a57a0de10b430babcaa6

diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 481bd42..de2b4d2 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONEQUATION_HXX
 #define INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONEQUATION_HXX
 
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
@@ -30,7 +31,7 @@
 #include "ServiceMacros.hxx"
 #include "ModifyListenerHelper.hxx"
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <comphelper/uno3.hxx>
 
 namespace chart
@@ -38,7 +39,8 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper5<
+        css::lang::XServiceInfo,
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::util::XModifyBroadcaster,
         ::com::sun::star::util::XModifyListener,
@@ -57,16 +59,18 @@ public:
             ::com::sun::star::uno::XComponentContext > & xContext );
     virtual ~RegressionEquation();
 
-    //TODO: are these actually used (given they are not SAL_OVERRIDE)?
     virtual OUString SAL_CALL
         getImplementationName()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+        SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL
         supportsService( const OUString& ServiceName )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+        SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception )
+        SAL_OVERRIDE;
     static OUString getImplementationName_Static();
     static ::com::sun::star::uno::Sequence< OUString >
         getSupportedServiceNames_Static();


More information about the Libreoffice-commits mailing list