summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-05 08:09:38 +0200
committerNoel Grandin <noel@peralex.com>2014-06-05 08:17:47 +0200
commitb6c67082c04a0e749de669f56208094f372825bc (patch)
tree92764ac6a31a22d0daec720fc130fa0a4fca07d3 /toolkit
parent5ceded62aa5695239cc6ea6681f74340deb43cc8 (diff)
toolkit: remove SAL_THROW macro
Change-Id: Id9e27c6cbcdc0c229a0dc2a3ad075d62121e6c5d
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/accessiblecontrolcontext.cxx8
-rw-r--r--toolkit/source/controls/formattedcontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx2
-rw-r--r--toolkit/source/controls/unocontrols.cxx2
-rw-r--r--toolkit/source/helper/formpdfexport.cxx6
5 files changed, 10 insertions, 10 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 64f756720c80..1861b54eae0f 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -62,7 +62,7 @@ namespace toolkit
// (order matters: the first is the class name, the second is the class doing the ref counting)
- void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( Exception ) )
+ void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator )
{
OContextEntryGuard aGuard( this );
@@ -84,7 +84,7 @@ namespace toolkit
}
- OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( ) )
+ OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator )
{
OAccessibleControlContext* pNew = NULL;
try
@@ -100,7 +100,7 @@ namespace toolkit
}
- void OAccessibleControlContext::startModelListening( ) SAL_THROW( ( Exception ) )
+ void OAccessibleControlContext::startModelListening( )
{
Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY );
OSL_ENSURE( xModelComp.is(), "OAccessibleControlContext::startModelListening: invalid model!" );
@@ -109,7 +109,7 @@ namespace toolkit
}
- void OAccessibleControlContext::stopModelListening( ) SAL_THROW( ( Exception ) )
+ void OAccessibleControlContext::stopModelListening( )
{
Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY );
OSL_ENSURE( xModelComp.is(), "OAccessibleControlContext::stopModelListening: invalid model!" );
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index b678384ae362..38f2d37092ad 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -274,7 +274,7 @@ namespace toolkit
void UnoControlFormattedFieldModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles,
- Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(())
+ Any* _pValues, sal_Int32* _pValidHandles ) const
{
ImplEnsureHandleOrder( _nCount, _pHandles, _pValues, BASEPROPERTY_EFFECTIVE_VALUE, BASEPROPERTY_TEXT );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 0e3b41df3481..31c76bd025e7 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1371,7 +1371,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
void UnoControlModel::ImplNormalizePropertySequence( const sal_Int32, sal_Int32*,
- uno::Any*, sal_Int32* ) const SAL_THROW(())
+ uno::Any*, sal_Int32* ) const
{
// nothing to do here
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 3f759dbf3c4a..46c1d492c033 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -2102,7 +2102,7 @@ void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int3
void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles,
- uno::Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(())
+ uno::Any* _pValues, sal_Int32* _pValidHandles ) const
{
// dependencies we know:
// BASEPROPERTY_STRINGITEMLIST->BASEPROPERTY_SELECTEDITEMS
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 6696ab069614..097eaa05a9b3 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -61,7 +61,7 @@ namespace toolkitform
/** determines the FormComponentType of a form control
*/
- sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel ) SAL_THROW(( Exception ))
+ sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel )
{
static const OUString FM_PROP_CLASSID("ClassId");
sal_Int16 nControlType = FormComponentType::CONTROL;
@@ -120,7 +120,7 @@ namespace toolkitform
@precond
the model must be part of the form component hierarchy in a document
*/
- sal_Int32 determineRadioGroupId( const Reference< XPropertySet >& _rxRadioModel ) SAL_THROW((Exception))
+ sal_Int32 determineRadioGroupId( const Reference< XPropertySet >& _rxRadioModel )
{
OSL_ENSURE( classifyFormControl( _rxRadioModel ) == FormComponentType::RADIOBUTTON,
"determineRadioGroupId: this *is* no radio button model!" );
@@ -255,7 +255,7 @@ namespace toolkitform
/** creates a PDF compatible control descriptor for the given control
*/
void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
- ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
+ ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData )
{
_rpDescriptor.reset();
OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" );