summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/toolkit/controls/accessiblecontrolcontext.hxx10
-rw-r--r--include/toolkit/controls/formattedcontrol.hxx2
-rw-r--r--include/toolkit/controls/unocontrolmodel.hxx2
-rw-r--r--include/toolkit/controls/unocontrols.hxx2
-rw-r--r--include/toolkit/helper/formpdfexport.hxx2
-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
10 files changed, 19 insertions, 19 deletions
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 688f58ea575d..b18d2a57e91b 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -67,7 +67,7 @@ namespace toolkit
*/
void Init(
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
- ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
+ );
// OCommonAccessibleComponent overridables
virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
@@ -80,7 +80,7 @@ namespace toolkit
*/
static OAccessibleControlContext* create(
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
- ) SAL_THROW( ( ) );
+ );
protected:
// XInterface
@@ -110,12 +110,12 @@ namespace toolkit
private:
// retrieves the value of a string property from the model, if the property is present
- OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) );
+ OUString getModelStringProperty( const sal_Char* _pPropertyName );
// starts listening at the control model (currently for disposal only)
- void startModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
+ void startModelListening( );
// stops listening at the control model
- void stopModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
+ void stopModelListening( );
Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
};
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index d8e9fde2840d..35a51777112a 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -94,7 +94,7 @@ namespace toolkit
sal_Int32* _pHandles, /// the handles of the properties to set
::com::sun::star::uno::Any* _pValues, /// the values of the properties to set
sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted
- ) const SAL_THROW(()) SAL_OVERRIDE;
+ ) const SAL_OVERRIDE;
private:
void impl_updateTextFromValue_nothrow();
void impl_updateCachedFormatter_nothrow();
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index f971dd300fdc..6fe15a97d7d4 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -88,7 +88,7 @@ protected:
sal_Int32* _pHandles, /// the handles of the properties to set
::com::sun::star::uno::Any* _pValues, /// the values of the properties to set
sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted
- ) const SAL_THROW(());
+ ) const;
/// ensures that two property values in a sequence have a certain order
void ImplEnsureHandleOrder(
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 2b230c0fa0fd..3f1e21e75ddd 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -757,7 +757,7 @@ public:
sal_Int32* _pHandles, /// the handles of the properties to set
::com::sun::star::uno::Any* _pValues, /// the values of the properties to set
sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted
- ) const SAL_THROW(()) SAL_OVERRIDE;
+ ) const SAL_OVERRIDE;
// ::com::sun::star::beans::XMultiPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 5ded833a00e3..9375ca5bf81e 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -44,7 +44,7 @@ namespace toolkitform
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor,
::vcl::PDFExtOutDevData& i_pdfExportData
- ) SAL_THROW(());
+ );
} // namespace toolkitform
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!" );
generated by cgit (git 2.34.1) at 2024-06-29 00:10:19 +0000