summaryrefslogtreecommitdiff
path: root/framework/source/services
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /framework/source/services
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/services')
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx32
-rw-r--r--framework/source/services/autorecovery.cxx57
-rw-r--r--framework/source/services/desktop.cxx95
-rw-r--r--framework/source/services/dispatchhelper.cxx4
-rw-r--r--framework/source/services/frame.cxx337
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx1
-rw-r--r--framework/source/services/modulemanager.cxx61
-rw-r--r--framework/source/services/pathsettings.cxx161
-rw-r--r--framework/source/services/sessionlistener.cxx40
-rw-r--r--framework/source/services/substitutepathvars.cxx33
-rw-r--r--framework/source/services/taskcreatorsrv.cxx21
-rw-r--r--framework/source/services/uriabbreviation.cxx2
-rw-r--r--framework/source/services/urltransformer.cxx29
13 files changed, 261 insertions, 612 deletions
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index fd695d110b4e..fedd333ba5a5 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -61,33 +61,25 @@ public:
// XContextChangeEventMultiplexer
virtual void SAL_CALL addContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeAllContextChangeEventListeners (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) override;
virtual void SAL_CALL broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rContextChangeEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw (cssu::RuntimeException, std::exception) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService (
- const ::rtl::OUString& rsServiceName)
- throw (cssu::RuntimeException, std::exception) override;
- virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames()
- throw (cssu::RuntimeException, std::exception) override;
+ const ::rtl::OUString& rsServiceName) override;
+ virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() override;
// XEventListener
virtual void SAL_CALL disposing (
- const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception) override;
+ const css::lang::EventObject& rEvent) override;
typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
class FocusDescriptor
@@ -153,7 +145,6 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing()
void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw css::lang::IllegalArgumentException(
@@ -190,7 +181,6 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw cssl::IllegalArgumentException(
@@ -216,7 +206,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw cssl::IllegalArgumentException(
@@ -244,7 +233,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListener
void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rEventObject,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, std::exception)
{
// Remember the current context.
if (rxEventFocus.is())
@@ -308,26 +296,22 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G
}
OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName()
- throw(cssu::RuntimeException, std::exception)
{
return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer");
}
sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const ::rtl::OUString& rsServiceName)
- throw (cssu::RuntimeException, std::exception)
{
return cppu::supportsService(this, rsServiceName);
}
css::uno::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::getSupportedServiceNames()
- throw (cssu::RuntimeException, std::exception)
{
// it's a singleton, not a service
return css::uno::Sequence<OUString>();
}
void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception)
{
ListenerMap::iterator iDescriptor (maListeners.find(rEvent.Source));
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index cd74f30d07f0..a29ef9a37eba 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -439,20 +439,17 @@ public:
explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~AutoRecovery( ) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.AutoRecovery");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.AutoRecovery"};
}
@@ -462,26 +459,23 @@ public:
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () override
{ OWeakObject::release(); }
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
/// Initialization function after having acquire()'d.
void initListeners();
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// css.frame.XDispatch
virtual void SAL_CALL dispatch(const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override;
virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
// css.document.XDocumentEventListener
/** @short informs about created/opened documents.
@@ -493,20 +487,16 @@ public:
@param aEvent
points to the new created/opened document.
*/
- virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) override;
// css.util.XChangesListener
- virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
// css.util.XModifyListener
- virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
// css.lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
protected:
@@ -515,20 +505,17 @@ protected:
virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue )
- throw(css::lang::IllegalArgumentException) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
- const css::uno::Any& aValue )
- throw(css::uno::Exception, std::exception) override;
+ const css::uno::Any& aValue ) override;
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& aValue ,
sal_Int32 nHandle) const override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
private:
virtual void SAL_CALL disposing() final override;
@@ -1268,7 +1255,7 @@ void AutoRecovery::disposing()
implts_stopTimer();
}
-Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType )
{
Any aRet = AutoRecovery_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -1276,7 +1263,7 @@ Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(
return aRet;
}
-Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( )
{
return comphelper::concatSequences(
AutoRecovery_BASE::getTypes(),
@@ -1286,7 +1273,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R
void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete);
@@ -1520,7 +1506,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception)
{
if (!xListener.is())
throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1553,7 +1538,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception)
{
if (!xListener.is())
throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1562,7 +1546,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
}
void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
@@ -1630,7 +1613,6 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
}
void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
const css::uno::Sequence< css::util::ElementChange > lChanges (aEvent.Changes);
const css::util::ElementChange* pChanges = lChanges.getConstArray();
@@ -1683,7 +1665,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
}
void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
if (! xDocument.is())
@@ -1693,7 +1674,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
}
void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
/* SAFE */ {
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -3977,7 +3957,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*
css::uno::Any& /*aOldValue*/ ,
sal_Int32 /*nHandle*/ ,
const css::uno::Any& /*aValue*/ )
- throw(css::lang::IllegalArgumentException)
{
// not needed currently
return false;
@@ -3985,7 +3964,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*
void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/,
const css::uno::Any& /*aValue*/ )
- throw(css::uno::Exception, std::exception)
{
// not needed currently
}
@@ -4065,7 +4043,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr;
if(!pInfo)
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 434435d481fe..62df7dc047da 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -76,19 +76,16 @@ enum PropHandle {
Title };
OUString SAL_CALL Desktop::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.framework.Desktop");
}
sal_Bool SAL_CALL Desktop::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence<OUString> SAL_CALL Desktop::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.frame.Desktop" };
}
@@ -192,7 +189,7 @@ Desktop::~Desktop()
SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk.desktop", "Desktop::~Desktop(): Who forgot to dispose this service?" );
}
-css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType )
{
css::uno::Any aRet = Desktop_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -200,7 +197,7 @@ css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) t
return aRet;
}
-css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( )
{
return comphelper::concatSequences(
Desktop_BASE::getTypes(),
@@ -209,7 +206,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u
}
sal_Bool SAL_CALL Desktop::terminate()
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -389,14 +385,12 @@ namespace
}
bool SAL_CALL Desktop::terminateQuickstarterToo()
- throw( css::uno::RuntimeException )
{
QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
return terminate();
}
void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -444,7 +438,6 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
}
void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
@@ -509,7 +502,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
@onerror We return a null-reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -534,7 +527,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
@onerror We return a null-reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -569,7 +562,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
@onerror We return a null reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -610,9 +603,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString& sURL ,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
- css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -643,7 +634,7 @@ But; Don't forget - you will be the owner of returned object and must release it
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks()
{
SAL_INFO("fwk.desktop", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier");
return nullptr;
@@ -665,7 +656,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask()
{
SAL_INFO("fwk.desktop", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier");
return nullptr;
@@ -692,7 +683,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL& aURL ,
const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 nSearchFlags )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -718,7 +709,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
}
}
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -739,7 +730,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
@threadsafe yes
*//*-*************************************************************************************************************/
void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw( css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -748,7 +738,6 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe
}
void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw( css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
@@ -771,7 +760,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -797,7 +786,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -819,7 +808,7 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF
}
}
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -834,86 +823,86 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
@descr Some method make no sense for our desktop! He has no window or parent or ...
So we should implement it empty and warn programmer, if he use it!
*/
-void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& )
{
}
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow()
{
return css::uno::Reference< css::awt::XWindow >();
}
-void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ )
{
}
-css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator()
{
return css::uno::Reference< css::frame::XFramesSupplier >();
}
-OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL Desktop::getName()
{
SolarMutexGuard g;
return m_sName;
}
-void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setName( const OUString& sName )
{
SolarMutexGuard g;
m_sName = sName;
}
-sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isTop()
{
return true;
}
-void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::activate()
{
// Desktop is active always... but sometimes our frames try to activate
// the complete path from bottom to top... And our desktop is the topest frame :-(
// So - please don't show any assertions here. Do nothing!
}
-void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::deactivate()
{
// Desktop is active always... but sometimes our frames try to deactivate
// the complete path from bottom to top... And our desktop is the topest frame :-(
// So - please don't show any assertions here. Do nothing!
}
-sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isActive()
{
return true;
}
sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ ,
- const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Reference< css::frame::XController >& /*xController*/ )
{
return false;
}
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow()
{
return css::uno::Reference< css::awt::XWindow >();
}
-css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController()
{
return css::uno::Reference< css::frame::XController >();
}
-void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::contextChanged()
{
}
-void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
{
}
// css::frame::XFrame
-void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
{
}
@@ -945,7 +934,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
@threadsafe yes
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 nSearchFlags )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1067,7 +1056,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
}
void SAL_CALL Desktop::disposing()
- throw( css::uno::RuntimeException )
{
// Safe impossible cases
// It's an programming error if dispose is called before terminate!
@@ -1148,7 +1136,7 @@ void SAL_CALL Desktop::disposing()
@param "xListener", reference to valid listener. We don't accept invalid values!
@threadsafe yes
*/
-void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Safe impossible cases
@@ -1160,7 +1148,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
-void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Safe impossible cases
@@ -1185,7 +1173,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang
@param "aEvent", state event which (hopefully) valid information
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1213,7 +1201,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
@seealso method loadComponentFromURL()
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::disposing( const css::lang::EventObject& )
{
SAL_WARN( "fwk.desktop", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." );
}
@@ -1238,7 +1226,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un
@param "xRequest", request for interaction - normal a wrapped target exception from bottom services
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1307,31 +1295,24 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
}
::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
return m_xTitleNumberGenerator->leaseNumber (xComponent);
}
void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
m_xTitleNumberGenerator->releaseNumber (nNumber);
}
void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
m_xTitleNumberGenerator->releaseNumberForComponent (xComponent);
}
OUString SAL_CALL Desktop::getUntitledPrefix()
- throw (css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
return m_xTitleNumberGenerator->getUntitledPrefix ();
@@ -1364,7 +1345,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aConvertedValue ,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
+ const css::uno::Any& aValue )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1418,7 +1399,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon
@threadsafe yes
*//*-*************************************************************************************************************/
void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception )
+ const css::uno::Any& aValue )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1515,7 +1496,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue ,
@return reference to object with information [XPropertySetInfo]
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 73311778683b..da6bc9c52997 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -78,7 +78,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw(css::uno::RuntimeException, std::exception)
{
// check for valid parameters
if (
@@ -113,7 +112,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
const css::util::URL& aURL ,
bool SyncronFlag ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw(css::uno::RuntimeException)
{
css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
m_aResult.clear();
@@ -167,7 +165,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
describes the result of the dispatch operation
*/
void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResultEvent& aResult )
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_aResult <<= aResult;
@@ -181,7 +178,6 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult
describe the source of this event and MUST be our save broadcaster!
*/
void SAL_CALL DispatchHelper::disposing( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_aResult.clear();
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index cb6994a07b3e..1af055615b1f 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -123,20 +123,17 @@ public:
/// Initialization function after having acquire()'d.
void initListeners();
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.Frame");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.Frame"};
}
@@ -147,251 +144,163 @@ public:
const OUString& sURL,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::io::IOException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
// XFramesSupplier
- virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames() override;
+ virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame() override;
+ virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame) override;
// XFrame
- virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setName(const OUString & sName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow) override;
+ virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow() override;
+ virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator) override;
+ virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator() override;
+ virtual OUString SAL_CALL getName() override;
+ virtual void SAL_CALL setName(const OUString & sName) override;
virtual css::uno::Reference < css::frame::XFrame > SAL_CALL findFrame(
const OUString & sTargetFrameName,
- sal_Int32 nSearchFlags)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isTop()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL activate()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deactivate()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isActive()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL contextChanged()
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nSearchFlags) override;
+ virtual sal_Bool SAL_CALL isTop() override;
+ virtual void SAL_CALL activate() override;
+ virtual void SAL_CALL deactivate() override;
+ virtual sal_Bool SAL_CALL isActive() override;
+ virtual void SAL_CALL contextChanged() override;
virtual sal_Bool SAL_CALL setComponent(
const css::uno::Reference < css::awt::XWindow > & xComponentWindow,
- const css::uno::Reference < css::frame::XController > & xController)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XController > SAL_CALL getController()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XController > & xController) override;
+ virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow() override;
+ virtual css::uno::Reference < css::frame::XController > SAL_CALL getController() override;
+ virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
+ virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
// XComponent
virtual void SAL_CALL disposing() override;
- virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
+ virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
// XStatusIndicatorFactory
- virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator() override;
// XDispatchProvider
virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL & aURL,
const OUString & sTargetFrameName,
- sal_Int32 nSearchFlags)
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nSearchFlags) override;
virtual css::uno::Sequence < css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
- const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor) override;
// XDispatchProviderInterception
virtual void SAL_CALL registerDispatchProviderInterceptor(
- const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
virtual void SAL_CALL releaseDispatchProviderInterceptor(
- const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
// XDispatchInformationProvider
- virtual css::uno::Sequence < sal_Int16 > SAL_CALL getSupportedCommandGroups()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < sal_Int16 > SAL_CALL getSupportedCommandGroups() override;
+ virtual css::uno::Sequence < css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) override;
// XWindowListener
// Attention: windowResized() and windowShown() are implement only! All other are empty!
- virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent) override;
+ virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent) override;
// XFocusListener
// Attention: focusLost() not implemented yet!
- virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
+ virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent) override;
+ virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ ) override {};
// XTopWindowListener
// Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty!
- virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
+ virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ ) override {};
// XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent) override;
// XActionLockable
- virtual sal_Bool SAL_CALL isActionLocked()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addActionLock()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeActionLock()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActionLocks(sal_Int16 nLock)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL resetActionLocks()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isActionLocked() override;
+ virtual void SAL_CALL addActionLock() override;
+ virtual void SAL_CALL removeActionLock() override;
+ virtual void SAL_CALL setActionLocks(sal_Int16 nLock) override;
+ virtual sal_Int16 SAL_CALL resetActionLocks() override;
// XCloseable
- virtual void SAL_CALL close(sal_Bool bDeliverOwnership)
- throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL close(sal_Bool bDeliverOwnership) override;
// XCloseBroadcaster
- virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
+ virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
// XTitle
- virtual OUString SAL_CALL getTitle()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setTitle(const OUString & sTitle)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitle() override;
+ virtual void SAL_CALL setTitle(const OUString & sTitle) override;
// XTitleChangeBroadcaster
- virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener) override;
+ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr) override;
// XFrame2 attributes
- virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes() override;
- virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier() override;
+ virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & ) override;
- virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager() override;
+ virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & ) override;
// XPropertySet
- virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
- virtual void SAL_CALL setPropertyValue(const OUString & sProperty, const css::uno::Any & aValue)
- throw (css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue(const OUString & sProperty, const css::uno::Any & aValue) override;
- virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
virtual void SAL_CALL removePropertyChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
virtual void SAL_CALL addVetoableChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
// XPropertySetInfo
- virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties() override;
- virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName)
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName) override;
private:
@@ -423,9 +332,7 @@ private:
* The owner of this class has to be sure, that every new property does
* not clash with any existing one.
*/
- void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty)
- throw(css::beans::PropertyExistException,
- css::uno::Exception );
+ void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty);
/** mark the object as "dead".
*/
@@ -674,10 +581,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::io::IOException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -697,7 +600,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -721,7 +623,6 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -744,7 +645,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
@onerror An assertion is thrown and element is ignored, if given frame isn't already a child of us.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -848,7 +748,6 @@ void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutM
@onerror We do nothing.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow )
- throw( css::uno::RuntimeException, std::exception )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
if (!xWindow.is())
@@ -925,7 +824,6 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_xContainerWindow;
@@ -949,7 +847,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -973,7 +870,6 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -990,7 +886,6 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
@onerror An empty string is returned.
*//*-*****************************************************************************************************/
OUString SAL_CALL Frame::getName()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_sName;
@@ -1009,7 +904,6 @@ OUString SAL_CALL Frame::getName()
@onerror We do nothing.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setName( const OUString& sName )
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
// Set new name... but look for invalid special target names!
@@ -1045,7 +939,6 @@ void SAL_CALL Frame::setName( const OUString& sName )
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1301,7 +1194,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
@onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool SAL_CALL Frame::isTop()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -1321,7 +1213,6 @@ sal_Bool SAL_CALL Frame::isTop()
@seealso listener mechanism
*//*-*****************************************************************************************************/
void SAL_CALL Frame::activate()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -1402,7 +1293,7 @@ void SAL_CALL Frame::activate()
@seealso enum EActiveState
@seealso listener mechanism
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::deactivate()
{
checkDisposed();
@@ -1476,7 +1367,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
@onerror No error should occur.
*//*-*****************************************************************************************************/
-sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Frame::isActive()
{
checkDisposed();
SolarMutexGuard g;
@@ -1486,7 +1377,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce
/*-****************************************************************************************************
@short ???
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::contextChanged()
{
// Sometimes called during closing object...
// Impl-method is threadsafe himself!
@@ -1524,7 +1415,6 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
*//*-*****************************************************************************************************/
sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWindow >& xComponentWindow,
const css::uno::Reference< css::frame::XController >& xController )
- throw( css::uno::RuntimeException, std::exception )
{
// Ignore this HACK of sfx2!
@@ -1682,7 +1572,6 @@ sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWind
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -1706,7 +1595,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_xController;
@@ -1722,14 +1610,12 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
@onerror Listener is ignored.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
}
void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
}
@@ -1754,7 +1640,6 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
- throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -1845,20 +1730,17 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
}
void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
}
OUString SAL_CALL Frame::getTitle()
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1872,7 +1754,6 @@ OUString SAL_CALL Frame::getTitle()
}
void SAL_CALL Frame::setTitle( const OUString& sTitle )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1886,7 +1767,6 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle )
}
void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1900,7 +1780,6 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra
}
void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1914,21 +1793,18 @@ void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::
}
css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes()
- throw (css::uno::RuntimeException, std::exception)
{
// optional attribute
return nullptr;
}
css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xDispatchRecorderSupplier;
}
void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>& p)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
SolarMutexGuard g;
@@ -1936,14 +1812,12 @@ void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::
}
css::uno::Reference<css::uno::XInterface> SAL_CALL Frame::getLayoutManager()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xLayoutManager;
}
void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInterface>& p1)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
SolarMutexGuard g;
@@ -1951,7 +1825,6 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
css::uno::Reference< css::beans::XPropertySetInfo > xInfo(
@@ -1961,12 +1834,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertyS
void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
const css::uno::Any& aValue )
- throw(css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// TODO look for e.g. readonly props and reject setProp() call!
@@ -2004,10 +1871,6 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
}
css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2026,10 +1889,6 @@ css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
void SAL_CALL Frame::addPropertyChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2049,10 +1908,6 @@ void SAL_CALL Frame::addPropertyChangeListener(
void SAL_CALL Frame::removePropertyChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// SAFE ->
SolarMutexClearableGuard aReadLock;
@@ -2070,10 +1925,6 @@ void SAL_CALL Frame::removePropertyChangeListener(
void SAL_CALL Frame::addVetoableChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2093,10 +1944,6 @@ void SAL_CALL Frame::addVetoableChangeListener(
void SAL_CALL Frame::removeVetoableChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// SAFE ->
SolarMutexClearableGuard aReadLock;
@@ -2112,7 +1959,6 @@ void SAL_CALL Frame::removeVetoableChangeListener(
}
css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2133,8 +1979,6 @@ css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
}
css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
- throw(css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2148,7 +1992,6 @@ css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
}
sal_Bool SAL_CALL Frame::hasPropertyByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2366,14 +2209,12 @@ void SAL_CALL Frame::disposing()
@onerror Listener is ignored.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
@@ -2390,7 +2231,6 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
@onerror We return a null reference.
*//*-*****************************************************************************************************/
css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2436,7 +2276,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags)
- throw( css::uno::RuntimeException, std::exception )
{
// Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
@@ -2480,7 +2319,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
*//*-*****************************************************************************************************/
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches(
const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
- throw( css::uno::RuntimeException, std::exception )
{
// Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
@@ -2510,7 +2348,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
*//*-*****************************************************************************************************/
void SAL_CALL Frame::registerDispatchProviderInterceptor(
const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
- throw( css::uno::RuntimeException, std::exception )
{
// We use a helper to support these interface and an interceptor mechanism.
// This helper is threadsafe himself and check incoming parameter too.
@@ -2530,7 +2367,6 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor(
void SAL_CALL Frame::releaseDispatchProviderInterceptor(
const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
- throw( css::uno::RuntimeException, std::exception )
{
// We use a helper to support these interface and an interceptor mechanism.
// This helper is threadsafe himself and check incoming parameter too.
@@ -2553,14 +2389,12 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor(
inside the current frame environment
*//*-*****************************************************************************************************/
css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xDispatchInfoHelper->getSupportedCommandGroups();
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(
sal_Int16 nCommandGroup)
- throw(css::uno::RuntimeException, std::exception)
{
return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup);
}
@@ -2576,7 +2410,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu
@param "aEvent" describe source of detected event
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
- throw( css::uno::RuntimeException, std::exception )
{
// Part of dispose-mechanism
@@ -2587,7 +2420,6 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
}
void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
- throw( css::uno::RuntimeException, std::exception )
{
// Part of dispose() mechanism
@@ -2616,7 +2448,6 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
@param "aEvent" describe source of detected event
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2635,7 +2466,6 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
// Sometimes called during dispose()
@@ -2680,7 +2510,6 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2734,7 +2563,6 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
static bool bFirstVisibleTask = true;
static osl::Mutex aFirstVisibleLock;
@@ -2765,7 +2593,6 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
/* SAFE { */
SolarMutexClearableGuard aReadLock;
@@ -2787,7 +2614,6 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
@seealso XFocusListener
*//*-*****************************************************************************************************/
void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
- throw( css::uno::RuntimeException, std::exception )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexResettableGuard aWriteLock;
@@ -2818,21 +2644,18 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
@threadsafe yes
*//*-*************************************************************************************************************/
sal_Bool SAL_CALL Frame::isActionLocked()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return( m_nExternalLockCount!=0);
}
void SAL_CALL Frame::addActionLock()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
++m_nExternalLockCount;
}
void SAL_CALL Frame::removeActionLock()
- throw( css::uno::RuntimeException, std::exception )
{
{
SolarMutexGuard g;
@@ -2845,7 +2668,6 @@ void SAL_CALL Frame::removeActionLock()
}
void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
// Attention: If somewhere called resetActionLocks() before and get e.g. 5 locks ...
@@ -2856,7 +2678,6 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
}
sal_Int16 SAL_CALL Frame::resetActionLocks()
- throw( css::uno::RuntimeException, std::exception )
{
sal_Int16 nCurrentLocks = 0;
{
@@ -2985,8 +2806,6 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un
}
void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
- throw(css::beans::PropertyExistException,
- css::uno::Exception )
{
SolarMutexGuard g;
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 38fbb1d77838..ac8a1f2ea52d 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -52,7 +52,6 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper,
// XStringMapping
sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq)
- throw (uno::RuntimeException, std::exception)
{
bool bModified = false;
for( sal_Int32 i = rSeq.getLength(); i--; )
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 53f89089a309..b4a602f77a1c 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -65,55 +65,37 @@ public:
ModuleManager& operator=(const ModuleManager&) = delete;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(
- OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ OUString const & ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
// XModuleManager
- virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
- throw(css::lang::IllegalArgumentException,
- css::frame::UnknownModuleException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) override;
// XNameReplace
virtual void SAL_CALL replaceByName(const OUString& sName ,
- const css::uno::Any& aValue)
- throw (css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Any& aValue) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName(const OUString& sName)
- throw(css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName(const OUString& sName) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& sName) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// XContainerQuery
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) override;
private:
@@ -150,27 +132,21 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont
}
OUString ModuleManager::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.framework.ModuleManager");
}
sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.frame.ModuleManager" };
}
OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
- throw(css::lang::IllegalArgumentException,
- css::frame::UnknownModuleException,
- css::uno::RuntimeException, std::exception )
{
// valid parameter?
css::uno::Reference< css::frame::XFrame > xFrame (xModule, css::uno::UNO_QUERY);
@@ -222,10 +198,6 @@ OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::X
void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
const css::uno::Any& aValue)
- throw (css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception )
{
::comphelper::SequenceAsHashMap lProps(aValue);
if (lProps.empty() )
@@ -273,9 +245,6 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
}
css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
- throw(css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception )
{
// get access to the element
css::uno::Reference< css::container::XNameAccess > xModule;
@@ -302,37 +271,31 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
}
css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->getElementNames();
}
sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->hasByName(sName);
}
css::uno::Type SAL_CALL ModuleManager::getElementType()
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
}
sal_Bool SAL_CALL ModuleManager::hasElements()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->hasElements();
}
css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&)
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Reference< css::container::XEnumeration >();
}
css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
- throw(css::uno::RuntimeException, std::exception)
{
::comphelper::SequenceAsHashMap lSearchProps(lProperties);
const css::uno::Sequence< OUString > lModules = getElementNames();
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index e4440da6e30b..bd4488e664af 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -185,170 +185,160 @@ public:
/** free all used resources ... if it was not already done. */
virtual ~PathSettings() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PathSettings");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
css::uno::Sequence< OUString > aSeq { "com.sun.star.util.PathSettings" };
return aSeq;
}
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
virtual void SAL_CALL acquire() throw () override
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () override
{ OWeakObject::release(); }
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// css::util::XChangesListener
- virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
// css::lang::XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aSource)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) override;
/**
* XPathSettings attribute methods
*/
- virtual OUString SAL_CALL getAddin() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAddin() override
{ return getStringProperty("Addin"); }
- virtual void SAL_CALL setAddin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAddin(const OUString& p1) override
{ setStringProperty("Addin", p1); }
- virtual OUString SAL_CALL getAutoCorrect() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAutoCorrect() override
{ return getStringProperty("AutoCorrect"); }
- virtual void SAL_CALL setAutoCorrect(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAutoCorrect(const OUString& p1) override
{ setStringProperty("AutoCorrect", p1); }
- virtual OUString SAL_CALL getAutoText() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAutoText() override
{ return getStringProperty("AutoText"); }
- virtual void SAL_CALL setAutoText(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAutoText(const OUString& p1) override
{ setStringProperty("AutoText", p1); }
- virtual OUString SAL_CALL getBackup() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBackup() override
{ return getStringProperty("Backup"); }
- virtual void SAL_CALL setBackup(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBackup(const OUString& p1) override
{ setStringProperty("Backup", p1); }
- virtual OUString SAL_CALL getBasic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasic() override
{ return getStringProperty("Basic"); }
- virtual void SAL_CALL setBasic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasic(const OUString& p1) override
{ setStringProperty("Basic", p1); }
- virtual OUString SAL_CALL getBitmap() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBitmap() override
{ return getStringProperty("Bitmap"); }
- virtual void SAL_CALL setBitmap(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBitmap(const OUString& p1) override
{ setStringProperty("Bitmap", p1); }
- virtual OUString SAL_CALL getConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getConfig() override
{ return getStringProperty("Config"); }
- virtual void SAL_CALL setConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setConfig(const OUString& p1) override
{ setStringProperty("Config", p1); }
- virtual OUString SAL_CALL getDictionary() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getDictionary() override
{ return getStringProperty("Dictionary"); }
- virtual void SAL_CALL setDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setDictionary(const OUString& p1) override
{ setStringProperty("Dictionary", p1); }
- virtual OUString SAL_CALL getFavorite() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getFavorite() override
{ return getStringProperty("Favorite"); }
- virtual void SAL_CALL setFavorite(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setFavorite(const OUString& p1) override
{ setStringProperty("Favorite", p1); }
- virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getFilter() override
{ return getStringProperty("Filter"); }
- virtual void SAL_CALL setFilter(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setFilter(const OUString& p1) override
{ setStringProperty("Filter", p1); }
- virtual OUString SAL_CALL getGallery() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getGallery() override
{ return getStringProperty("Gallery"); }
- virtual void SAL_CALL setGallery(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setGallery(const OUString& p1) override
{ setStringProperty("Gallery", p1); }
- virtual OUString SAL_CALL getGraphic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getGraphic() override
{ return getStringProperty("Graphic"); }
- virtual void SAL_CALL setGraphic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setGraphic(const OUString& p1) override
{ setStringProperty("Graphic", p1); }
- virtual OUString SAL_CALL getHelp() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getHelp() override
{ return getStringProperty("Help"); }
- virtual void SAL_CALL setHelp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setHelp(const OUString& p1) override
{ setStringProperty("Help", p1); }
- virtual OUString SAL_CALL getLinguistic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getLinguistic() override
{ return getStringProperty("Linguistic"); }
- virtual void SAL_CALL setLinguistic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setLinguistic(const OUString& p1) override
{ setStringProperty("Linguistic", p1); }
- virtual OUString SAL_CALL getModule() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getModule() override
{ return getStringProperty("Module"); }
- virtual void SAL_CALL setModule(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setModule(const OUString& p1) override
{ setStringProperty("Module", p1); }
- virtual OUString SAL_CALL getPalette() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getPalette() override
{ return getStringProperty("Palette"); }
- virtual void SAL_CALL setPalette(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPalette(const OUString& p1) override
{ setStringProperty("Palette", p1); }
- virtual OUString SAL_CALL getPlugin() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getPlugin() override
{ return getStringProperty("Plugin"); }
- virtual void SAL_CALL setPlugin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPlugin(const OUString& p1) override
{ setStringProperty("Plugin", p1); }
- virtual OUString SAL_CALL getStorage() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getStorage() override
{ return getStringProperty("Storage"); }
- virtual void SAL_CALL setStorage(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setStorage(const OUString& p1) override
{ setStringProperty("Storage", p1); }
- virtual OUString SAL_CALL getTemp() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getTemp() override
{ return getStringProperty("Temp"); }
- virtual void SAL_CALL setTemp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setTemp(const OUString& p1) override
{ setStringProperty("Temp", p1); }
- virtual OUString SAL_CALL getTemplate() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getTemplate() override
{ return getStringProperty("Template"); }
- virtual void SAL_CALL setTemplate(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setTemplate(const OUString& p1) override
{ setStringProperty("Template", p1); }
- virtual OUString SAL_CALL getUIConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUIConfig() override
{ return getStringProperty("UIConfig"); }
- virtual void SAL_CALL setUIConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUIConfig(const OUString& p1) override
{ setStringProperty("UIConfig", p1); }
- virtual OUString SAL_CALL getUserConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUserConfig() override
{ return getStringProperty("UserConfig"); }
- virtual void SAL_CALL setUserConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUserConfig(const OUString& p1) override
{ setStringProperty("UserConfig", p1); }
- virtual OUString SAL_CALL getUserDictionary() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUserDictionary() override
{ return getStringProperty("UserDictionary"); }
- virtual void SAL_CALL setUserDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUserDictionary(const OUString& p1) override
{ setStringProperty("UserDictionary", p1); }
- virtual OUString SAL_CALL getWork() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getWork() override
{ return getStringProperty("Work"); }
- virtual void SAL_CALL setWork(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setWork(const OUString& p1) override
{ setStringProperty("Work", p1); }
- virtual OUString SAL_CALL getBasePathShareLayer() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasePathShareLayer() override
{ return getStringProperty("UIConfig"); }
- virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) override
{ setStringProperty("UIConfig", p1); }
- virtual OUString SAL_CALL getBasePathUserLayer() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasePathUserLayer() override
{ return getStringProperty("UserConfig"); }
- virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) override
{ setStringProperty("UserConfig", p1); }
/**
* overrides to resolve inheritance ambiguity
*/
- virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2)
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
{ ::cppu::OPropertySetHelper::setPropertyValue(p1, p2); }
- virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
{ return ::cppu::OPropertySetHelper::getPropertyValue(p1); }
- virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); }
/** read all configured paths and create all needed internal structures. */
void impl_readAll();
@@ -357,12 +347,10 @@ private:
virtual void SAL_CALL disposing() final override;
/// @throws css::uno::RuntimeException
- OUString getStringProperty(const OUString& p1)
- throw(css::uno::RuntimeException);
+ OUString getStringProperty(const OUString& p1);
/// @throws css::uno::RuntimeException
- void setStringProperty(const OUString& p1, const OUString& p2)
- throw(css::uno::RuntimeException);
+ void setStringProperty(const OUString& p1, const OUString& p2);
/** read a path info using the old cfg schema.
This is needed for "migration on demand" reasons only.
@@ -438,9 +426,9 @@ private:
virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue,
css::uno::Any& aOldValue,
sal_Int32 nHandle,
- const css::uno::Any& aValue ) throw(css::lang::IllegalArgumentException) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
- const css::uno::Any& aValue ) throw(css::uno::Exception, std::exception) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue,
sal_Int32 nHandle ) const override;
// Avoid:
@@ -448,7 +436,7 @@ private:
// warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual]
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
/** factory methods to guarantee right (but on demand) initialized members ... */
css::uno::Reference< css::util::XStringSubstitution > fa_getSubstitution();
@@ -489,7 +477,6 @@ void SAL_CALL PathSettings::disposing()
}
css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType )
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Any aRet = PathSettings_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -498,7 +485,6 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp
}
css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( )
- throw(css::uno::RuntimeException, std::exception)
{
return comphelper::concatSequences(
PathSettings_BASE::getTypes(),
@@ -507,7 +493,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( )
}
void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
sal_Int32 c = aEvent.Changes.getLength();
sal_Int32 i = 0;
@@ -537,7 +522,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
}
void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -546,7 +530,6 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
}
OUString PathSettings::getStringProperty(const OUString& p1)
- throw(css::uno::RuntimeException)
{
css::uno::Any a = ::cppu::OPropertySetHelper::getPropertyValue(p1);
OUString s;
@@ -555,7 +538,6 @@ OUString PathSettings::getStringProperty(const OUString& p1)
}
void PathSettings::setStringProperty(const OUString& p1, const OUString& p2)
- throw(css::uno::RuntimeException)
{
::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2));
}
@@ -1387,7 +1369,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
const css::uno::Any& aValue )
- throw(css::lang::IllegalArgumentException)
{
// throws NoSuchElementException !
css::uno::Any aCurrentVal = impl_getPathValue(nHandle);
@@ -1401,7 +1382,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC
void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
const css::uno::Any& aValue )
- throw(css::uno::Exception, std::exception)
{
// throws NoSuchElement- and IllegalArgumentException !
impl_setPathValue(nHandle, aValue);
@@ -1419,7 +1399,6 @@ void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue ,
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Reference< css::beans::XPropertySetInfo >(
::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 8723177494c2..89be517fe071 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -110,46 +110,37 @@ public:
virtual ~SessionListener() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.frame.SessionListener");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.SessionListener"};
}
- virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject&) override;
// XInitialization
- virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) override;
// XSessionManagerListener
- virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL shutdownCanceled()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL doRestore()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) override;
+ virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted ) override;
+ virtual void SAL_CALL shutdownCanceled() override;
+ virtual sal_Bool SAL_CALL doRestore() override;
// XSessionManagerListener2
- virtual void SAL_CALL doQuit()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doQuit() override;
// XStatusListener
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event) override;
};
SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -229,7 +220,7 @@ void SessionListener::QuitSessionQuietly()
}
}
-void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) throw (RuntimeException, std::exception)
+void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source)
{
SAL_INFO("fwk.session", "SessionListener::disposing");
if (Source.Source == m_rSessionManager) {
@@ -238,7 +229,6 @@ void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) t
}
void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::initialize");
@@ -274,7 +264,6 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
}
void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event)
- throw (css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::statusChanged");
@@ -297,7 +286,6 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve
}
sal_Bool SAL_CALL SessionListener::doRestore()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doRestore");
osl::MutexGuard g(m_aMutex);
@@ -322,7 +310,6 @@ sal_Bool SAL_CALL SessionListener::doRestore()
}
void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ )
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doSave");
@@ -342,7 +329,6 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl
}
void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::approveInteraction");
// do AutoSave as the first step
@@ -396,7 +382,6 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
}
void SessionListener::shutdownCanceled()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::shutdownCanceled");
// set the state back
@@ -404,7 +389,6 @@ void SessionListener::shutdownCanceled()
}
void SessionListener::doQuit()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doQuit");
if ( m_bSessionStoreRequested && !m_bTerminated )
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 861c973a3f1d..2f38a872a094 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -137,31 +137,25 @@ class SubstitutePathVariables : private cppu::BaseMutex,
public:
explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PathSubstitution");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.util.PathSubstitution"};
}
// XStringSubstitution
- virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) override;
+ virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override;
+ virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override;
protected:
void SetPredefinedPathVariables();
@@ -177,15 +171,12 @@ protected:
// XStringSubstitution implementation methods
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString impl_substituteVariable( const OUString& aText, bool bSustRequired );
/// @throws css::uno::RuntimeException
- OUString impl_reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException);
+ OUString impl_reSubstituteVariables( const OUString& aText );
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString const & impl_getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString const & impl_getSubstituteVariableValue( const OUString& variable );
private:
typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
@@ -234,21 +225,18 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon
// XStringSubstitution
OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_substituteVariable( aText, bSubstRequired );
}
OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText )
-throw ( RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_reSubstituteVariables( aText );
}
OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_getSubstituteVariableValue( aVariable );
@@ -326,7 +314,6 @@ OUString SubstitutePathVariables::GetPathVariableValue() const
}
OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException )
{
// This is maximal recursive depth supported!
const sal_Int32 nMaxRecursiveDepth = 8;
@@ -513,7 +500,6 @@ throw ( NoSuchElementException, RuntimeException )
}
OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL )
-throw ( RuntimeException )
{
OUString aURL;
@@ -594,7 +580,6 @@ throw ( RuntimeException )
// This method support both request schemes "$("<varname>")" or "<varname>".
OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable )
-throw ( NoSuchElementException, RuntimeException )
{
OUString aVariable;
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index ca41f84236e0..d66eff4fcb09 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -65,32 +65,25 @@ public:
explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.TaskCreator");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.TaskCreator"};
}
// XSingleServiceFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) override;
private:
@@ -119,15 +112,11 @@ TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XCom
}
css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >());
}
css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
::comphelper::SequenceAsHashMap lArgs(lArguments);
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 5c924f1ae5bc..b6707cff57b3 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -48,7 +48,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
}
// css::util::XStringAbbreviation:
-OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString)
{
OUString aResult( aString );
if ( xStringWidth.is() )
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 5078747a264f..d84f5b6180d3 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -37,35 +37,28 @@ class URLTransformer : public ::cppu::WeakImplHelper< css::util::XURLTransformer
public:
URLTransformer() {}
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.URLTransformer");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.util.URLTransformer"};
}
- virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL ) override;
- virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol ) override;
- virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL ) override;
- virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword ) override;
};
namespace
@@ -121,7 +114,7 @@ namespace
}
// XURLTransformer
-sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )
@@ -173,7 +166,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css
// XURLTransformer
sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
- const OUString& sSmartProtocol ) throw( css::uno::RuntimeException, std::exception )
+ const OUString& sSmartProtocol )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )
@@ -225,7 +218,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
}
// XURLTransformer
-sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL )
{
// Initialize parser.
INetURLObject aParser;
@@ -284,7 +277,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
// XURLTransformer
OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
- sal_Bool bWithPassword ) throw( css::uno::RuntimeException, std::exception )
+ sal_Bool bWithPassword )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )