diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-03-26 07:46:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-26 07:46:30 +0200 |
| commit | 975bbf29dfda6296b9f89958fe8c27af372150e7 (patch) | |
| tree | 2d433b8cb8c6fdd6d5dbe53442b519b045acecdb /chart2/source/model/template | |
| parent | 86090ef2fb4ea06f687d9e4474b8bdfda6eb6871 (diff) | |
Error: exception specification of overriding function is more lax than base
Change-Id: Iffcc2084e005b27653964ddc6e965744be370a16
Diffstat (limited to 'chart2/source/model/template')
4 files changed, 10 insertions, 6 deletions
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 6cc13bc0e34b..39b57c34a938 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -179,6 +179,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() + throw (::css::uno::RuntimeException, ::std::exception) { return sal_True; } diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 5f551b09e088..43a26b0357a1 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -92,7 +92,8 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); /// denotes if the chart needs categories at the first scale - virtual sal_Bool SAL_CALL supportsCategories(); + virtual sal_Bool SAL_CALL supportsCategories() + throw (::css::uno::RuntimeException, ::std::exception); virtual void SAL_CALL changeDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index c551111e8dd2..da5b8c1b57a7 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -49,8 +49,8 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde } uno::Reference<chart2::XChartType> -GL3DBarChartTypeTemplate::getChartTypeForNewSeries( - const uno::Sequence<uno::Reference<chart2::XChartType> >& xOldChartTypes ) +GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& xOldChartTypes ) + throw (::css::uno::RuntimeException, ::std::exception) { uno::Reference<chart2::XChartType> xResult; @@ -77,6 +77,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( } sal_Bool GL3DBarChartTypeTemplate::supportsCategories() + throw (::css::uno::RuntimeException, ::std::exception) { return false; } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index 56aa2208f3cb..4f4a0ce2df99 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -34,10 +34,11 @@ public: // XChartTypeTemplate virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL - getChartTypeForNewSeries( - const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ); + getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) + throw (::css::uno::RuntimeException, ::std::exception); - virtual sal_Bool SAL_CALL supportsCategories(); + virtual sal_Bool SAL_CALL supportsCategories() + throw (::css::uno::RuntimeException, ::std::exception); }; } |