summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-05 08:07:32 +0200
committerNoel Grandin <noel@peralex.com>2014-06-05 08:17:46 +0200
commit41066fef1ca94723615838fd521d08c5d37aac5b (patch)
tree96a9d0de50b748359676cf43b879ba6d3406af0f
parent89d982ab83f5388c7b1c6220d258a10e2788b9b2 (diff)
comphelper: remove SAL_THROW macro
Change-Id: I692f1213c4bf42a84fae119f513e609d8874bf0c
-rw-r--r--comphelper/source/eventattachermgr/eventattachermgr.cxx4
-rw-r--r--comphelper/source/misc/accessiblecontexthelper.cxx4
-rw-r--r--comphelper/source/misc/accessibleeventnotifier.cxx8
-rw-r--r--comphelper/source/misc/listenernotification.cxx2
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx4
-rw-r--r--comphelper/source/property/propertystatecontainer.cxx2
-rw-r--r--include/comphelper/accessiblecontexthelper.hxx8
-rw-r--r--include/comphelper/accessibleeventnotifier.hxx8
-rw-r--r--include/comphelper/componentmodule.hxx2
-rw-r--r--include/comphelper/listenernotification.hxx22
-rw-r--r--include/comphelper/propertycontainerhelper.hxx6
-rw-r--r--include/comphelper/propertystatecontainer.hxx2
-rw-r--r--include/comphelper/string.hxx12
13 files changed, 41 insertions, 43 deletions
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index f28d6d383a28..1de52115dfed 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -132,7 +132,7 @@ private:
@return
the iterator pointing to the position indicated by the index
*/
- ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex ) SAL_THROW ( ( IllegalArgumentException ) );
+ ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex );
};
@@ -395,7 +395,7 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc
-::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) SAL_THROW ( ( IllegalArgumentException ) )
+::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex )
{
if (_nIndex < 0)
throw IllegalArgumentException();
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 0daab3529fdc..718c83a78449 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -202,7 +202,7 @@ namespace comphelper
}
- void OAccessibleContextHelper::ensureAlive() const SAL_THROW( ( DisposedException ) )
+ void OAccessibleContextHelper::ensureAlive() const
{
if( !isAlive() )
throw DisposedException();
@@ -293,7 +293,7 @@ namespace comphelper
}
- Reference< XAccessibleContext > OAccessibleContextHelper::implGetParentContext() SAL_THROW( ( RuntimeException ) )
+ Reference< XAccessibleContext > OAccessibleContextHelper::implGetParentContext()
{
Reference< XAccessible > xParent = getAccessibleParent();
Reference< XAccessibleContext > xParentContext;
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 9f9c90df6750..2282c9f81729 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -189,7 +189,7 @@ namespace comphelper
void AccessibleEventNotifier::revokeClientNotifyDisposing( const TClientId _nClient,
- const Reference< XInterface >& _rxEventSource ) SAL_THROW( ( ) )
+ const Reference< XInterface >& _rxEventSource )
{
::cppu::OInterfaceContainerHelper* pListeners(0);
@@ -224,7 +224,7 @@ namespace comphelper
sal_Int32 AccessibleEventNotifier::addEventListener(
- const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) )
+ const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener )
{
::osl::MutexGuard aGuard( lclMutex::get() );
@@ -241,7 +241,7 @@ namespace comphelper
sal_Int32 AccessibleEventNotifier::removeEventListener(
- const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) )
+ const TClientId _nClient, const Reference< XAccessibleEventListener >& _rxListener )
{
::osl::MutexGuard aGuard( lclMutex::get() );
@@ -257,7 +257,7 @@ namespace comphelper
}
- void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent ) SAL_THROW( ( ) )
+ void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent )
{
Sequence< Reference< XInterface > > aListeners;
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index c933219cf819..481821dc0dc3 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.cxx
@@ -76,7 +76,7 @@ namespace comphelper
}
- bool OListenerContainer::impl_notify( const EventObject& _rEvent ) SAL_THROW(( Exception ))
+ bool OListenerContainer::impl_notify( const EventObject& _rEvent )
{
::cppu::OInterfaceIteratorHelper aIter( m_aListeners );
bool bCancelled = false;
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index fca26062e0ad..62be2f65695a 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -221,7 +221,7 @@ namespace
bool OPropertyContainerHelper::convertFastPropertyValue(
- Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) SAL_THROW( (IllegalArgumentException) )
+ Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
{
bool bModified = false;
@@ -366,7 +366,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
}
-void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) SAL_THROW( (Exception) )
+void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue)
{
// get the property somebody is asking for
PropertiesIterator aPos = searchHandle(_nHandle);
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 550692ffa280..4e41561ed4b0 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -67,7 +67,7 @@ namespace comphelper
IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase )
- sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) )
+ sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName )
{
// look up the handle for the name
::cppu::IPropertyArrayHelper& rPH = getInfoHelper();
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 960fb6b5773e..b1c8cec19871 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -189,7 +189,7 @@ namespace comphelper
};
// ensures that the object is alive
- inline void ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
+ inline void ensureAlive( const OAccessControl& ) const;
inline IMutex* getExternalLock( const OAccessControl& );
inline ::osl::Mutex& GetMutex( const OAccessControl& );
@@ -219,7 +219,7 @@ namespace comphelper
/// checks whether the object is alive (returns <TRUE/> then) or disposed
bool isAlive() const;
/// checks for beeing alive. If the object is already disposed (i.e. not alive), an exception is thrown.
- void ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
+ void ensureAlive() const;
/** ensures that the object is disposed.
@precond
@@ -230,7 +230,7 @@ namespace comphelper
/** shortcut for retrieving the context of the parent (returned by getAccessibleParent)
*/
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
- implGetParentContext() SAL_THROW( ( ::com::sun::star::uno::RuntimeException ) );
+ implGetParentContext();
// access to the base class' broadcast helper/mutex
::cppu::OBroadcastHelper& GetBroadcastHelper() { return rBHelper; }
@@ -240,7 +240,7 @@ namespace comphelper
};
- inline void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) )
+ inline void OAccessibleContextHelper::ensureAlive( const OAccessControl& ) const
{
ensureAlive();
}
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index dfe188741749..96b1831e59d8 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -83,7 +83,7 @@ namespace comphelper
static void revokeClientNotifyDisposing(
const TClientId _nClient,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxEventSource
- ) SAL_THROW( ( ) );
+ );
/** registers a listener for the given client
@@ -95,7 +95,7 @@ namespace comphelper
static sal_Int32 addEventListener(
const TClientId _nClient,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& _rxListener
- ) SAL_THROW( ( ) );
+ );
/** revokes a listener for the given client
@@ -107,7 +107,7 @@ namespace comphelper
static sal_Int32 removeEventListener(
const TClientId _nClient,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& _rxListener
- ) SAL_THROW( ( ) );
+ );
/** adds an event, which is to be braodcasted, to the queue
@@ -117,7 +117,7 @@ namespace comphelper
static void addEvent(
const TClientId _nClient,
const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent
- ) SAL_THROW( ( ) );
+ );
};
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 47299c910eff..9f23a1769b94 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -44,7 +44,7 @@ namespace comphelper
OUString const& _rComponentName,
::com::sun::star::uno::Sequence< OUString > const & _rServiceNames,
rtl_ModuleCount*
- ) SAL_THROW(());
+ );
//= ComponentDescription
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 5ae133bd5f95..38409eaa54f2 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -75,12 +75,12 @@ namespace comphelper
/** determines whether the listener container is currently empty
*/
inline bool
- empty() const SAL_THROW(());
+ empty() const;
/** determines the number of elements in the container
*/
inline size_t
- size() const SAL_THROW(());
+ size() const;
/** creates an iterator for looping through all registered listeners
*/
@@ -110,7 +110,7 @@ namespace comphelper
@see implNotify
*/
- bool impl_notify( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_THROW(( ::com::sun::star::uno::Exception ));
+ bool impl_notify( const ::com::sun::star::lang::EventObject& _rEvent );
protected:
/** call a single listener
@@ -138,16 +138,16 @@ namespace comphelper
virtual bool implNotify(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener,
const ::com::sun::star::lang::EventObject& _rEvent
- ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) = 0;
+ ) = 0;
};
- inline bool OListenerContainer::empty() const SAL_THROW(())
+ inline bool OListenerContainer::empty() const
{
return ( m_aListeners.getLength() == 0 );
}
- inline size_t OListenerContainer::size() const SAL_THROW(())
+ inline size_t OListenerContainer::size() const
{
return m_aListeners.getLength();
}
@@ -200,13 +200,13 @@ namespace comphelper
using OListenerContainer::createIterator;
/// typed notification
- inline bool notify( const EventClass& _rEvent, NotificationMethod _pNotify ) SAL_THROW(( ::com::sun::star::uno::Exception ));
+ inline bool notify( const EventClass& _rEvent, NotificationMethod _pNotify );
protected:
virtual bool implNotify(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener,
const ::com::sun::star::lang::EventObject& _rEvent
- ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE
+ ) SAL_OVERRIDE
{
const EventClass& rTypedEvent( static_cast< const EventClass& >( _rEvent ) );
ListenerClass* pTypedListener( static_cast< ListenerClass* >( _rxListener.get() ) );
@@ -217,7 +217,7 @@ namespace comphelper
template< class LISTENER, class EVENT >
- inline bool OSimpleListenerContainer< LISTENER, EVENT >::notify( const EventClass& _rEvent, NotificationMethod _pNotify ) SAL_THROW(( ::com::sun::star::uno::Exception ))
+ inline bool OSimpleListenerContainer< LISTENER, EVENT >::notify( const EventClass& _rEvent, NotificationMethod _pNotify )
{
m_pNotificationMethod = _pNotify;
bool bRet = OListenerContainer::impl_notify( _rEvent );
@@ -263,7 +263,7 @@ namespace comphelper
virtual bool implNotify(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener,
const ::com::sun::star::lang::EventObject& _rEvent
- ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE
+ ) SAL_OVERRIDE
{
return implTypedNotify(
::com::sun::star::uno::Reference< ListenerClass >( static_cast< ListenerClass* >( _rxListener.get() ) ),
@@ -274,7 +274,7 @@ namespace comphelper
virtual bool implTypedNotify(
const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener,
const EventClass& _rEvent
- ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) = 0;
+ ) = 0;
};
} // namespace comphelper
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index c52dd0aace6a..9654985dddef 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -151,14 +151,12 @@ protected:
::com::sun::star::uno::Any & rOldValue,
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue
- )
- SAL_THROW((::com::sun::star::lang::IllegalArgumentException));
+ );
void setFastPropertyValue(
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue
- )
- SAL_THROW((::com::sun::star::uno::Exception));
+ );
void getFastPropertyValue(
::com::sun::star::uno::Any& rValue,
diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index 3c928b27d984..ed7c6b341742 100644
--- a/include/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
@@ -102,7 +102,7 @@ namespace comphelper
@throw UnknownPropertyException if the given name is not a registered property
*/
- sal_Int32 getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
+ sal_Int32 getHandleForName( const OUString& _rPropertyName );
};
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index ca47fb560968..74bc6a11ae0f 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -179,7 +179,7 @@ COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
is returned
*/
inline OString getToken(const OString &rIn,
- sal_Int32 nToken, sal_Char cTok) SAL_THROW(())
+ sal_Int32 nToken, sal_Char cTok)
{
return rIn.getToken(nToken, cTok);
}
@@ -195,7 +195,7 @@ inline OString getToken(const OString &rIn,
is returned
*/
inline OUString getToken(const OUString &rIn,
- sal_Int32 nToken, sal_Unicode cTok) SAL_THROW(())
+ sal_Int32 nToken, sal_Unicode cTok)
{
return rIn.getToken(nToken, cTok);
}
@@ -254,13 +254,13 @@ namespace detail
@return rBuf;
*/
inline OStringBuffer& truncateToLength(
- OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+ OStringBuffer& rBuffer, sal_Int32 nLength)
{
return detail::truncateToLength(rBuffer, nLength);
}
inline OUStringBuffer& truncateToLength(
- OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+ OUStringBuffer& rBuffer, sal_Int32 nLength)
{
return detail::truncateToLength(rBuffer, nLength);
}
@@ -296,14 +296,14 @@ namespace detail
*/
inline OStringBuffer& padToLength(
OStringBuffer& rBuffer, sal_Int32 nLength,
- sal_Char cFill = '\0') SAL_THROW(())
+ sal_Char cFill = '\0')
{
return detail::padToLength(rBuffer, nLength, cFill);
}
inline OUStringBuffer& padToLength(
OUStringBuffer& rBuffer, sal_Int32 nLength,
- sal_Unicode cFill = '\0') SAL_THROW(())
+ sal_Unicode cFill = '\0')
{
return detail::padToLength(rBuffer, nLength, cFill);
}