Kaydet (Commit) 41066fef authored tarafından Noel Grandin's avatar Noel Grandin

comphelper: remove SAL_THROW macro

Change-Id: I692f1213c4bf42a84fae119f513e609d8874bf0c
üst 89d982ab
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
......@@ -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();
......
......@@ -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();
}
......
......@@ -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( ( ) );
);
};
......
......@@ -44,7 +44,7 @@ namespace comphelper
OUString const& _rComponentName,
::com::sun::star::uno::Sequence< OUString > const & _rServiceNames,
rtl_ModuleCount*
) SAL_THROW(());
);
//= ComponentDescription
......
......@@ -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
......
......@@ -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,
......
......@@ -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 );
};
......
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment