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

[Tor Lillqvist]

 chart2/source/model/template/ChartTypeTemplate.cxx        |    1 +
 chart2/source/model/template/ChartTypeTemplate.hxx        |    3 ++-
 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx |    5 +++--
 chart2/source/model/template/GL3DBarChartTypeTemplate.hxx |    7 ++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 975bbf29dfda6296b9f89958fe8c27af372150e7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 26 07:46:30 2014 +0200

    Error: exception specification of overriding function is more lax than base
    
    Change-Id: Iffcc2084e005b27653964ddc6e965744be370a16

diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 6cc13bc..39b57c3 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 5f551b0..43a26b0 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 c551111..da5b8c1 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 56aa220..4f4a0ce 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);
 };
 
 }