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

[Tor Lillqvist]

 unotools/source/misc/ServiceDocumenter.cxx |    3 +++
 unotools/source/misc/ServiceDocumenter.hxx |   14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 2dea4d270806f47a324cb09c1db7751499930cf7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 07:42:54 2015 +0300

    Fix error: exception specification of overriding function is more lax ...
    
    ... than base version.
    
    Change-Id: Id1b33eebcdb16b5d3b495359793a638b8e8b0820

diff --git a/unotools/source/misc/ServiceDocumenter.cxx b/unotools/source/misc/ServiceDocumenter.cxx
index 8991cc3..6750a69 100644
--- a/unotools/source/misc/ServiceDocumenter.cxx
+++ b/unotools/source/misc/ServiceDocumenter.cxx
@@ -15,6 +15,7 @@ using lang::XServiceInfo;
 using lang::XTypeProvider;
 
 void unotools::misc::ServiceDocumenter::showCoreDocs(const Reference<XServiceInfo>& xService)
+    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xService.is())
         return;
@@ -24,6 +25,7 @@ void unotools::misc::ServiceDocumenter::showCoreDocs(const Reference<XServiceInf
 }
 
 void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeProvider>& xTypeProvider)
+    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xTypeProvider.is())
         return;
@@ -40,6 +42,7 @@ void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeP
 }
 
 void unotools::misc::ServiceDocumenter::showServiceDocs(const Reference<XServiceInfo>& xService)
+    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xService.is())
         return;
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index 1e04a81..e1855b1 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -25,17 +25,17 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
             , m_sServiceBaseUrl("http://api.libreoffice.org/docs/idl/ref")
             {};
         // XServiceDocumenter
-        virtual ::rtl::OUString SAL_CALL getCoreBaseUrl() /* throw (::css::uno::RuntimeException, ::std::exception) */ SAL_OVERRIDE
+        virtual ::rtl::OUString SAL_CALL getCoreBaseUrl() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             { return m_sCoreBaseUrl; };
-        virtual void SAL_CALL setCoreBaseUrl( const ::rtl::OUString& sCoreBaseUrl ) /* throw (::css::uno::RuntimeException, ::std::exception) */ SAL_OVERRIDE
+        virtual void SAL_CALL setCoreBaseUrl( const ::rtl::OUString& sCoreBaseUrl ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             { m_sCoreBaseUrl = sCoreBaseUrl; };
-        virtual ::rtl::OUString SAL_CALL getServiceBaseUrl() /* throw (::css::uno::RuntimeException, ::std::exception) */ SAL_OVERRIDE
+        virtual ::rtl::OUString SAL_CALL getServiceBaseUrl() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             { return m_sServiceBaseUrl; };
-        virtual void SAL_CALL setServiceBaseUrl( const ::rtl::OUString& sServiceBaseUrl ) /* throw (::css::uno::RuntimeException, ::std::exception) */ SAL_OVERRIDE
+        virtual void SAL_CALL setServiceBaseUrl( const ::rtl::OUString& sServiceBaseUrl ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             { m_sServiceBaseUrl = sServiceBaseUrl; };
-        virtual void showServiceDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) SAL_OVERRIDE;
-        virtual void showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) SAL_OVERRIDE;
-        virtual void showCoreDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) SAL_OVERRIDE;
+        virtual void showServiceDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void showCoreDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     protected:
         virtual ~ServiceDocumenter()
             {};