mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error: exception specification of overriding function is more lax than base

Browse Source 
Change-Id: Iffcc2084e005b27653964ddc6e965744be370a16
This commit is contained in:
Tor Lillqvist
2014-03-26 07:46:30 +02:00
parent 86090ef2fb
commit 975bbf29df
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/source/model/template/ChartTypeTemplate.cxx
View File

@@ -179,6 +179,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource
} }
sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories()
throw (::css::uno::RuntimeException, ::std::exception)
{ {
return sal_True; return sal_True;
} }

3
chart2/source/model/template/ChartTypeTemplate.hxx
View File

@@ -92,7 +92,8 @@ protected:
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
throw (::com::sun::star::uno::RuntimeException, std::exception); throw (::com::sun::star::uno::RuntimeException, std::exception);
/// denotes if the chart needs categories at the first scale /// 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( virtual void SAL_CALL changeDiagram(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )

5
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
View File

@@ -49,8 +49,8 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde
} }
uno::Reference<chart2::XChartType> uno::Reference<chart2::XChartType>
GL3DBarChartTypeTemplate::getChartTypeForNewSeries( GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& xOldChartTypes )
const uno::Sequence<uno::Reference<chart2::XChartType> >& xOldChartTypes ) throw (::css::uno::RuntimeException, ::std::exception)
{ {
uno::Reference<chart2::XChartType> xResult; uno::Reference<chart2::XChartType> xResult;
@@ -77,6 +77,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries(
} }
sal_Bool GL3DBarChartTypeTemplate::supportsCategories() sal_Bool GL3DBarChartTypeTemplate::supportsCategories()
throw (::css::uno::RuntimeException, ::std::exception)
{ {
return false; return false;
} }

7
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
View File

@@ -34,10 +34,11 @@ public:
// XChartTypeTemplate // XChartTypeTemplate
virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL
getChartTypeForNewSeries( getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes )
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);
}; };
} }