[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - filter/source sfx2/inc sfx2/source

[Juergen Funk]

 filter/source/config/cache/typedetection.hxx     |    6 +++---
 sfx2/inc/preventduplicateinteraction.hxx         |    9 +++++----
 sfx2/source/appl/preventduplicateinteraction.cxx |    1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 6ce5c193a1ea787453e69f38e3aaebd67aec0031
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Wed Dec 13 12:00:22 2017 +0000

    fix build: incompatible exception specs
    
    For gcc 4x and 5.2, we need to have matching, or more narrow, exception
    specs for overridden virtual methods.
    
    Change-Id: I2f2da8b8a9ac5639a3d885cd6851e1d0125651b1

diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index f948e6522697..ae75131a0fa6 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -383,17 +383,17 @@ private:
 public:
 
     using cppu::WeakComponentImplHelperBase::disposing;
-    virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+    virtual void SAL_CALL disposing(const css::lang::EventObject&) throw ()  override
     {
     }
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination(const css::lang::EventObject&) override
+    virtual void SAL_CALL queryTermination(const css::lang::EventObject&) throw () override
     {
         m_pTypeDetection->cancel();
     }
 
-    virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) override
+    virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) throw () override
     {
     }
 
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index f9097576e480..0f89169b6087 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -81,19 +81,19 @@ private:
 public:
 
     using cppu::WeakComponentImplHelperBase::disposing;
-    virtual void SAL_CALL disposing(const css::lang::EventObject&) override
+    virtual void SAL_CALL disposing(const css::lang::EventObject&) throw () override
     {
     }
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination(const css::lang::EventObject&) override
+    virtual void SAL_CALL queryTermination(const css::lang::EventObject&) throw () override
     {
         closewarningdialogs();
         Application::PostUserEvent(LINK(this, WarningDialogsParent, TerminateDesktop));
         throw css::frame::TerminationVetoException();
     }
 
-    virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) override
+    virtual void SAL_CALL notifyTermination(const css::lang::EventObject&) throw () override
     {
     }
 
@@ -221,7 +221,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
     // uno interface
     public:
 
-        virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments)
+        throw(css::uno::RuntimeException, std::exception) override;
 
         /**
             @interface  XInteractionHandler
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx b/sfx2/source/appl/preventduplicateinteraction.cxx
index 7ef25e70e82d..dd7263d51c6d 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -243,6 +243,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&
 }
 
 void SAL_CALL PreventDuplicateInteraction::initialize(const css::uno::Sequence<css::uno::Any>& rArguments)
+              throw (css::uno::RuntimeException, std::exception)
 {
     // If we're re-initialized to set a specific new window as a parent then drop our temporary
     // dialog parent