summaryrefslogtreecommitdiff
path: root/include/comphelper
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 /include/comphelper
parent89d982ab83f5388c7b1c6220d258a10e2788b9b2 (diff)
comphelper: remove SAL_THROW macro
Change-Id: I692f1213c4bf42a84fae119f513e609d8874bf0c
Diffstat (limited to 'include/comphelper')
-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
7 files changed, 29 insertions, 31 deletions
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);
}