[Libreoffice-commits] core.git: chart2/source
Stephan Bergmann
sbergman at redhat.com
Fri Mar 28 04:36:34 PDT 2014
chart2/source/model/template/AreaChartType.hxx | 7 +++----
chart2/source/model/template/BarChartType.hxx | 7 +++----
chart2/source/model/template/BubbleChartType.hxx | 7 +++----
chart2/source/model/template/CandleStickChartType.hxx | 7 +++----
chart2/source/model/template/ChartType.hxx | 5 +++--
chart2/source/model/template/ColumnChartType.hxx | 7 +++----
chart2/source/model/template/FilledNetChartType.hxx | 7 +++----
chart2/source/model/template/GL3DBarChartType.hxx | 7 +++----
chart2/source/model/template/LineChartType.hxx | 7 +++----
chart2/source/model/template/NetChartType.hxx | 7 +++----
chart2/source/model/template/PieChartType.hxx | 7 +++----
chart2/source/model/template/ScatterChartType.hxx | 7 +++----
12 files changed, 36 insertions(+), 46 deletions(-)
New commits:
commit 1d8f8c55f841bee0fdf0aee4ac15b023aadbb78e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 12:24:47 2014 +0100
Missing XServiceInfo base class
Change-Id: Ib629a60d626c10ac9628d172896790e90d2daf51
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index 7ba638d..bb74175 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~AreaChartType();
- //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();
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 0f7496b..71d0dad 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~BarChartType();
- //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();
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index 8ea10d5..a74533b 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -34,16 +34,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~BubbleChartType();
- //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();
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index b22e443..6f00058 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~CandleStickChartType();
- //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();
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 76f5595..82eb8033 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -21,7 +21,7 @@
#include "MutexContainer.hxx"
#include "OPropertySet.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase6.hxx>
#include <comphelper/uno3.hxx>
#include "ServiceMacros.hxx"
#include "ModifyListenerHelper.hxx"
@@ -38,7 +38,8 @@ namespace chart
namespace impl
{
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper6<
+ css::lang::XServiceInfo,
::com::sun::star::chart2::XChartType,
::com::sun::star::chart2::XDataSeriesContainer,
::com::sun::star::util::XCloneable,
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index eb14206..a5287d9 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~ColumnChartType();
- //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();
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index d23aa9e..6690f5d 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -32,16 +32,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~FilledNetChartType();
- //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();
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index 8c37009..aa5ab6b 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -25,16 +25,15 @@ public:
GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext );
virtual ~GL3DBarChartType();
- //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();
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index ca7ac9d..28d25ab 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -34,16 +34,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~LineChartType();
- //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();
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index 1c90bc1..aaf548e 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -60,16 +60,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~NetChartType();
- //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();
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index 6c350fd..575bfff4 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -34,16 +34,15 @@ public:
sal_Bool bUseRings = sal_False );
virtual ~PieChartType();
- //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();
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index 91d29f0..d5be8d0 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -38,16 +38,15 @@ public:
sal_Int32 nOrder = 3 );
virtual ~ScatterChartType();
- //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