summaryrefslogtreecommitdiff
path: root/include/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 /include/toolkit
parent5ceded62aa5695239cc6ea6681f74340deb43cc8 (diff)
toolkit: remove SAL_THROW macro
Change-Id: Id9e27c6cbcdc0c229a0dc2a3ad075d62121e6c5d
Diffstat (limited to 'include/toolkit')
-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
5 files changed, 9 insertions, 9 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