[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sfx2/inc
Juergen Funk
juergen.funk_ml at cib.de
Thu Dec 14 15:11:16 UTC 2017
sfx2/inc/preventduplicateinteraction.hxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 31441e9e0e1a20f57f45bbe5be0e0a1ae3c97ec2
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Dec 14 15:19:08 2017 +0100
fix build: more incompatible exception specs
For msvc too, we need to have matching, or more narrow, exception
specs for overridden virtual methods.
Change-Id: I334ae37d7f39e2adba822b79b23369e96e44c246
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index 0f89169b6087..7e031d2e6d2e 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -86,7 +86,8 @@ public:
}
// XTerminateListener
- virtual void SAL_CALL queryTermination(const css::lang::EventObject&) throw () override
+ virtual void SAL_CALL queryTermination(const css::lang::EventObject&)
+ throw (css::frame::TerminationVetoException) override
{
closewarningdialogs();
Application::PostUserEvent(LINK(this, WarningDialogsParent, TerminateDesktop));
@@ -222,7 +223,7 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments)
- throw(css::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
/**
@interface XInteractionHandler
More information about the Libreoffice-commits
mailing list