[Libreoffice-commits] core.git: include/sfx2 sfx2/source
Stephan Bergmann
sbergman at redhat.com
Mon May 19 13:53:06 PDT 2014
include/sfx2/sfxbasecontroller.hxx | 2 +-
sfx2/source/view/sfxbasecontroller.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d09124d94270e9d15e3cd0a86ec90e5e2a1822eb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon May 19 22:52:42 2014 +0200
Fix overriding exception specification
Change-Id: I6eb46f1ffccc1d98b1a1485486cbc355ce296cd3
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 5389d8f..a81568f 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -169,7 +169,7 @@ public:
virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// css::lang::XInitialization
- virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index cc4930a..98ad17d 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1524,7 +1524,7 @@ void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< fram
xBroadcaster->removeTitleChangeListener (xListener);
}
-void SfxBaseController::initialize( const ::css::uno::Sequence< ::css::uno::Any >& /*aArguments*/ )
+void SfxBaseController::initialize( const ::css::uno::Sequence< ::css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception)
{
if (m_pData->m_pViewShell)
m_pData->m_pViewShell->Initialize();
More information about the Libreoffice-commits
mailing list