Kaydet (Commit) 1d8f8c55 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Missing XServiceInfo base class

Change-Id: Ib629a60d626c10ac9628d172896790e90d2daf51
üst 48d09a74
...@@ -33,16 +33,15 @@ public: ...@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~AreaChartType(); virtual ~AreaChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -33,16 +33,15 @@ public: ...@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~BarChartType(); virtual ~BarChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -34,16 +34,15 @@ public: ...@@ -34,16 +34,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~BubbleChartType(); virtual ~BubbleChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -33,16 +33,15 @@ public: ...@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~CandleStickChartType(); virtual ~CandleStickChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "MutexContainer.hxx" #include "MutexContainer.hxx"
#include "OPropertySet.hxx" #include "OPropertySet.hxx"
#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase6.hxx>
#include <comphelper/uno3.hxx> #include <comphelper/uno3.hxx>
#include "ServiceMacros.hxx" #include "ServiceMacros.hxx"
#include "ModifyListenerHelper.hxx" #include "ModifyListenerHelper.hxx"
...@@ -38,7 +38,8 @@ namespace chart ...@@ -38,7 +38,8 @@ namespace chart
namespace impl namespace impl
{ {
typedef ::cppu::WeakImplHelper5< typedef ::cppu::WeakImplHelper6<
css::lang::XServiceInfo,
::com::sun::star::chart2::XChartType, ::com::sun::star::chart2::XChartType,
::com::sun::star::chart2::XDataSeriesContainer, ::com::sun::star::chart2::XDataSeriesContainer,
::com::sun::star::util::XCloneable, ::com::sun::star::util::XCloneable,
......
...@@ -33,16 +33,15 @@ public: ...@@ -33,16 +33,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~ColumnChartType(); virtual ~ColumnChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -32,16 +32,15 @@ public: ...@@ -32,16 +32,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~FilledNetChartType(); virtual ~FilledNetChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -25,16 +25,15 @@ public: ...@@ -25,16 +25,15 @@ public:
GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext );
virtual ~GL3DBarChartType(); virtual ~GL3DBarChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -34,16 +34,15 @@ public: ...@@ -34,16 +34,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~LineChartType(); virtual ~LineChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -60,16 +60,15 @@ public: ...@@ -60,16 +60,15 @@ public:
::com::sun::star::uno::XComponentContext > const & xContext ); ::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~NetChartType(); virtual ~NetChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -34,16 +34,15 @@ public: ...@@ -34,16 +34,15 @@ public:
sal_Bool bUseRings = sal_False ); sal_Bool bUseRings = sal_False );
virtual ~PieChartType(); virtual ~PieChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
...@@ -38,16 +38,15 @@ public: ...@@ -38,16 +38,15 @@ public:
sal_Int32 nOrder = 3 ); sal_Int32 nOrder = 3 );
virtual ~ScatterChartType(); virtual ~ScatterChartType();
//TODO: are these actually used (given they are not SAL_OVERRIDE)?
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ); throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static OUString getImplementationName_Static(); static OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment