summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-05 08:16:59 +0200
committerNoel Grandin <noel@peralex.com>2014-06-05 08:17:52 +0200
commit0e507ae031768deceab236a41d1bbe9fb5123cea (patch)
tree34cc1626f1e8fa6d50d6edd88045be6252150f19 /fpicker
parentdb246b491c1639942d9f952658d33974e9b06201 (diff)
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.hxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.hxx3
-rw-r--r--fpicker/source/office/commonpicker.cxx4
-rw-r--r--fpicker/source/office/commonpicker.hxx5
6 files changed, 9 insertions, 11 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 27a9925ffc29..0dbddcbaf63c 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -162,7 +162,7 @@ namespace svt
};
- void lcl_throwIllegalArgumentException( ) SAL_THROW( (IllegalArgumentException) )
+ void lcl_throwIllegalArgumentException( )
{
throw IllegalArgumentException();
// TODO: error message in the exception
@@ -234,7 +234,7 @@ namespace svt
}
- Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )
+ Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const
{
Control* pControl = NULL;
ControlDescription tmpDesc;
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 890f860d7659..857035e8f15a 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -91,7 +91,7 @@ namespace svt
Control* _pControl, sal_Int16 _nProperty, const ::com::sun::star::uno::Any& _rValue,
bool _bIgnoreIllegalArgument = true );
- Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
+ Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const;
/** implements the various methods for retrieving properties from controls
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 02e747a7c31c..4c1b5f8bfefb 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1082,7 +1082,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
}
-bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
+bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue )
{
if ( _rName == "TemplateDescription" )
{
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 27d980876744..b49d7721e4f6 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -210,8 +210,7 @@ protected:
virtual bool implHandleInitializationArgument(
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
- )
- SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) ) SAL_OVERRIDE;
+ ) SAL_OVERRIDE;
private:
WinBits getWinBits( WinBits& rExtraBits );
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 41b11916276b..745c877b5731 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -91,7 +91,7 @@ namespace svt
// XComponent related methods
- void OCommonPicker::checkAlive() const SAL_THROW( (DisposedException) )
+ void OCommonPicker::checkAlive() const
{
if ( GetBroadcastHelper().bInDispose || GetBroadcastHelper().bDisposed )
throw DisposedException();
@@ -476,7 +476,7 @@ namespace svt
}
- bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
+ bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue )
{
bool bKnown = true;
if ( _rName == "ParentWindow" )
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index b8c175ee6d67..004cdaa15c67 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -166,7 +166,7 @@ namespace svt
// misc
- void checkAlive() const SAL_THROW( (::com::sun::star::lang::DisposedException) );
+ void checkAlive() const;
void prepareDialog();
@@ -180,8 +180,7 @@ namespace svt
virtual bool implHandleInitializationArgument(
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
- )
- SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) );
+ );
private:
void stopWindowListening();