diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:09:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:47 +0200 |
commit | 5ceded62aa5695239cc6ea6681f74340deb43cc8 (patch) | |
tree | f3bb8b9efa30d5888770652eadbe815e117c35c0 /editeng | |
parent | 11383f56fb6889a324dd74725e5092ac4ce3999d (diff) |
editeng: remove SAL_THROW macro
Change-Id: I8e36112a10cdef6250dba4b4cf75e5eba443e0b9
Diffstat (limited to 'editeng')
4 files changed, 21 insertions, 23 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index f65a39a04771..8ce0e571d2f1 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -302,7 +302,7 @@ namespace accessibility } } - sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const SAL_THROW((uno::RuntimeException)) + sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const { return mnParagraphIndex; } @@ -385,7 +385,7 @@ namespace accessibility return MakeSelection( nEEIndex, nEEIndex ); } - void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) + void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) { if( nIndex < 0 || nIndex >= getCharacterCount() ) throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character index out of bounds", @@ -393,7 +393,7 @@ namespace accessibility ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy } - void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) + void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) { if( nIndex < 0 || nIndex > getCharacterCount() ) throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character position out of bounds", @@ -401,13 +401,13 @@ namespace accessibility ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy } - void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) + void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) { CheckPosition( nStart ); CheckPosition( nEnd ); } - bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((uno::RuntimeException)) + bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) { ESelection aSelection; sal_Int32 nPara = GetParagraphIndex(); @@ -450,17 +450,17 @@ namespace accessibility return true; } - OUString AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException)) + OUString AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) ); } - sal_uInt16 AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException)) + sal_uInt16 AccessibleEditableTextPara::GetTextLen() const { return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) ); } - SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException)) + SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const { if( mpEditSource ) return *mpEditSource; @@ -471,7 +471,7 @@ namespace accessibility ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } - SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException)) + SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const { SvxEditSourceAdapter& rEditSource = GetEditSource(); SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter(); @@ -491,7 +491,7 @@ namespace accessibility ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } - SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException)) + SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const { SvxEditSource& rEditSource = GetEditSource(); SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder(); @@ -513,7 +513,7 @@ namespace accessibility ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } - SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( bool bCreate ) const SAL_THROW((uno::RuntimeException)) + SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( bool bCreate ) const { SvxEditSourceAdapter& rEditSource = GetEditSource(); SvxAccessibleTextEditViewAdapter* pTextEditViewForwarder = rEditSource.GetEditViewForwarderAdapter( bCreate ); diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 5d4e3a8c27c6..03dc074c7db4 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -509,13 +509,13 @@ namespace accessibility catch( const uno::Exception& ) {} // optional behaviour } - sal_Int32 AccessibleImageBullet::GetParagraphIndex() const SAL_THROW((uno::RuntimeException)) + sal_Int32 AccessibleImageBullet::GetParagraphIndex() const { return mnParagraphIndex; } - SvxEditSource& AccessibleImageBullet::GetEditSource() const SAL_THROW((uno::RuntimeException)) + SvxEditSource& AccessibleImageBullet::GetEditSource() const { if( mpEditSource ) @@ -527,7 +527,7 @@ namespace accessibility ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } - SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException)) + SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const { SvxEditSource& rEditSource = GetEditSource(); @@ -548,7 +548,7 @@ namespace accessibility ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } - SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException)) + SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const { SvxEditSource& rEditSource = GetEditSource(); diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 340e8d2446d3..e11cbe74e1a3 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -120,13 +120,13 @@ namespace accessibility AccessibleStaticTextBase_Impl(); ~AccessibleStaticTextBase_Impl(); - SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException)) + SvxEditSourceAdapter& GetEditSource() const { return maEditSource; } SAL_WNODEPRECATED_DECLARATIONS_PUSH - void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException)); + void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ); SAL_WNODEPRECATED_DECLARATIONS_POP void SetEventSource( const uno::Reference< XAccessible >& rInterface ) @@ -232,7 +232,7 @@ namespace accessibility } SAL_WNODEPRECATED_DECLARATIONS_PUSH - void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException)) + void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) { maEditSource.SetEditSource( pEditSource ); @@ -512,7 +512,7 @@ namespace accessibility { } - const SvxEditSource& AccessibleStaticTextBase::GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException)) + const SvxEditSource& AccessibleStaticTextBase::GetEditSource() const { #ifdef DBG_UTIL mpImpl->CheckInvariants(); @@ -528,7 +528,7 @@ namespace accessibility } SAL_WNODEPRECATED_DECLARATIONS_PUSH - void AccessibleStaticTextBase::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException)) + void AccessibleStaticTextBase::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) { #ifdef DBG_UTIL // precondition: solar mutex locked @@ -604,7 +604,7 @@ namespace accessibility #endif } - void AccessibleStaticTextBase::UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException)) + void AccessibleStaticTextBase::UpdateChildren() { #ifdef DBG_UTIL // precondition: solar mutex locked diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 594c4f8d6f4d..9c75c28fb9f8 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1494,7 +1494,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames } uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames_Static() - SAL_THROW(()) { uno::Sequence< OUString > aSeq(3); aSeq[0] = "com.sun.star.style.CharacterProperties"; @@ -2248,7 +2247,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames( ) } uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Static( ) - SAL_THROW(()) { uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames_Static() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.text.Text" ); |