diff options
Diffstat (limited to 'editeng')
24 files changed, 259 insertions, 474 deletions
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index 495f84f84eef..6a2cd65dd80f 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -49,7 +49,6 @@ AccessibleComponentBase::~AccessibleComponentBase() sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) { awt::Size aSize (getSize()); return (aPoint.X >= 0) @@ -62,21 +61,18 @@ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( uno::Reference<XAccessible > SAL_CALL AccessibleComponentBase::getAccessibleAtPoint ( const awt::Point& /*aPoint*/) - throw (uno::RuntimeException, std::exception) { return uno::Reference<XAccessible>(); } awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() - throw (uno::RuntimeException, std::exception) { return awt::Rectangle(); } awt::Point SAL_CALL AccessibleComponentBase::getLocation() - throw (css::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); return awt::Point (aBBox.X, aBBox.Y); @@ -84,14 +80,12 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation() awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) { return awt::Point(); } css::awt::Size SAL_CALL AccessibleComponentBase::getSize() - throw (css::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); return awt::Size (aBBox.Width, aBBox.Height); @@ -99,7 +93,6 @@ css::awt::Size SAL_CALL AccessibleComponentBase::getSize() void SAL_CALL AccessibleComponentBase::grabFocus() - throw (css::uno::RuntimeException, std::exception) { uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY); uno::Reference<XAccessibleSelection> xSelection ( @@ -114,14 +107,12 @@ void SAL_CALL AccessibleComponentBase::grabFocus() sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() - throw (css::uno::RuntimeException, std::exception) { return Color(COL_BLACK).GetColor(); } sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() - throw (css::uno::RuntimeException, std::exception) { return Color(COL_WHITE).GetColor(); } @@ -131,21 +122,18 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleComponentBase::getFont() - throw (css::uno::RuntimeException, std::exception) { return uno::Reference<awt::XFont>(); } OUString SAL_CALL AccessibleComponentBase::getTitledBorderText() - throw (css::uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleComponentBase::getToolTipText() - throw (css::uno::RuntimeException, std::exception) { return OUString(); } @@ -154,7 +142,6 @@ OUString SAL_CALL AccessibleComponentBase::getToolTipText() uno::Sequence<uno::Type> SAL_CALL AccessibleComponentBase::getTypes() - throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (2); diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 7b80e9c8b178..8b00952cbfd0 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -145,7 +145,6 @@ bool AccessibleContextBase::GetState (sal_Int16 aState) void AccessibleContextBase::SetRelationSet ( const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet) - throw (css::uno::RuntimeException) { // Try to emit some meaningfull events indicating differing relations in // both sets. @@ -171,7 +170,6 @@ void AccessibleContextBase::SetRelationSet ( uno::Reference< XAccessibleContext> SAL_CALL AccessibleContextBase::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { return this; } @@ -183,7 +181,6 @@ uno::Reference< XAccessibleContext> SAL_CALL */ sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { return 0; } @@ -194,7 +191,6 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); throw lang::IndexOutOfBoundsException ( @@ -205,7 +201,6 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return mxParent; @@ -214,7 +209,6 @@ uno::Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. @@ -248,7 +242,6 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL AccessibleContextBase::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return maRole; @@ -257,7 +250,6 @@ sal_Int16 SAL_CALL OUString SAL_CALL AccessibleContextBase::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -267,7 +259,6 @@ OUString SAL_CALL OUString SAL_CALL AccessibleContextBase::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -287,7 +278,6 @@ OUString SAL_CALL */ uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleContextBase::getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -312,7 +302,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL */ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleContextBase::getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) { ::utl::AccessibleStateSetHelper* pStateSet = nullptr; @@ -350,8 +339,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL AccessibleContextBase::getLocale() - throw (IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Delegate request to parent. @@ -373,7 +360,6 @@ lang::Locale SAL_CALL void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( const uno::Reference<XAccessibleEventListener >& rxListener) - throw (uno::RuntimeException, std::exception) { if (rxListener.is()) { @@ -394,7 +380,6 @@ void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( const uno::Reference<XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (rxListener.is() && mnClientId) @@ -414,20 +399,17 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( // XServiceInfo OUString SAL_CALL AccessibleContextBase::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleContextBase"); } sal_Bool SAL_CALL AccessibleContextBase::supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString > SAL_CALL AccessibleContextBase::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.accessibility.Accessible", @@ -439,7 +421,6 @@ uno::Sequence< OUString > SAL_CALL uno::Sequence<sal_Int8> SAL_CALL AccessibleContextBase::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -464,7 +445,6 @@ void SAL_CALL AccessibleContextBase::disposing() void AccessibleContextBase::SetAccessibleDescription ( const OUString& rDescription, StringOrigin eDescriptionOrigin) - throw (uno::RuntimeException) { if (eDescriptionOrigin < meDescriptionOrigin || (eDescriptionOrigin == meDescriptionOrigin && msDescription != rDescription)) @@ -487,7 +467,6 @@ void AccessibleContextBase::SetAccessibleDescription ( void AccessibleContextBase::SetAccessibleName ( const OUString& rName, StringOrigin eNameOrigin) - throw (uno::RuntimeException) { if (eNameOrigin < meNameOrigin || (eNameOrigin == meNameOrigin && msName != rName)) @@ -508,14 +487,12 @@ void AccessibleContextBase::SetAccessibleName ( OUString AccessibleContextBase::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { return OUString("Empty Description"); } OUString AccessibleContextBase::CreateAccessibleName() - throw (css::uno::RuntimeException, std::exception) { return OUString("Empty Name"); } @@ -550,7 +527,6 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) void AccessibleContextBase::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 2216ecef38b9..1e5bdaa7e687 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -625,7 +625,7 @@ namespace accessibility nIndex ); } - uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) { uno::Any aRet; @@ -654,21 +654,21 @@ namespace accessibility } // XAccessible - uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() { // We implement the XAccessibleContext interface in the same object return uno::Reference< XAccessibleContext > ( this ); } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() { SolarMutexGuard aGuard; return HaveChildren() ? 1 : 0; } - uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) { SolarMutexGuard aGuard; @@ -699,24 +699,24 @@ namespace accessibility return aChild.get(); } - uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() { SAL_WARN_IF(!mxParent.is(), "editeng", "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?"); return mxParent; } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() { return mnIndexInParent; } - sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException, std::exception) + sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() { return AccessibleRole::PARAGRAPH; } - OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() { SolarMutexGuard aGuard; @@ -760,13 +760,13 @@ namespace accessibility return OUString( sStr ) + aLine; } - OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() { //See tdf#101003 before implementing a body return OUString(); } - uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() { // #i27138# - provide relations CONTENT_FLOWS_FROM // and CONTENT_FLOWS_TO @@ -938,7 +938,7 @@ namespace accessibility return OUString(); } - uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() { SolarMutexGuard aGuard; @@ -960,20 +960,20 @@ namespace accessibility return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) ); } - lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) + lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() { SolarMutexGuard aGuard; return implGetLocale(); } - void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener ); } - void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) { @@ -992,7 +992,7 @@ namespace accessibility } // XAccessibleComponent - sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint ) { SolarMutexGuard aGuard; @@ -1006,7 +1006,7 @@ namespace accessibility return aRect.IsInside( aPoint ); } - uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint ) { SolarMutexGuard aGuard; @@ -1039,7 +1039,7 @@ namespace accessibility return uno::Reference< XAccessible >(); } - awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() { SolarMutexGuard aGuard; @@ -1063,7 +1063,7 @@ namespace accessibility aScreenRect.GetSize().Height() ); } - awt::Point SAL_CALL AccessibleEditableTextPara::getLocation( ) throw (uno::RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleEditableTextPara::getLocation( ) { SolarMutexGuard aGuard; @@ -1072,7 +1072,7 @@ namespace accessibility return awt::Point( aRect.X, aRect.Y ); } - awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen( ) { SolarMutexGuard aGuard; @@ -1116,7 +1116,7 @@ namespace accessibility ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } - awt::Size SAL_CALL AccessibleEditableTextPara::getSize( ) throw (uno::RuntimeException, std::exception) + awt::Size SAL_CALL AccessibleEditableTextPara::getSize( ) { SolarMutexGuard aGuard; @@ -1125,13 +1125,13 @@ namespace accessibility return awt::Size( aRect.Width, aRect.Height ); } - void SAL_CALL AccessibleEditableTextPara::grabFocus( ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleEditableTextPara::grabFocus( ) { // set cursor to this paragraph setSelection(0,0); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) { // #104444# Added to XAccessibleComponent interface svtools::ColorConfig aColorConfig; @@ -1139,7 +1139,7 @@ namespace accessibility return static_cast<sal_Int32>(nColor); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) { // #104444# Added to XAccessibleComponent interface Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() ); @@ -1151,7 +1151,7 @@ namespace accessibility } // XAccessibleText - sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() { SolarMutexGuard aGuard; @@ -1179,12 +1179,12 @@ namespace accessibility return -1; } - sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) { return setSelection(nIndex, nIndex); } - sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -1194,7 +1194,7 @@ namespace accessibility return OCommonAccessibleText::getCharacter( nIndex ); } - uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& rRequestedAttributes ) { SolarMutexGuard aGuard; @@ -1298,7 +1298,7 @@ namespace accessibility return aRes; } - awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -1331,7 +1331,7 @@ namespace accessibility aScreenRect.GetSize().Height() ); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() { SolarMutexGuard aGuard; @@ -1341,7 +1341,7 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount(); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) { SolarMutexGuard aGuard; @@ -1387,7 +1387,7 @@ namespace accessibility } } - OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() { SolarMutexGuard aGuard; @@ -1400,7 +1400,7 @@ namespace accessibility return OCommonAccessibleText::getSelectedText(); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() { SolarMutexGuard aGuard; @@ -1413,7 +1413,7 @@ namespace accessibility return OCommonAccessibleText::getSelectionStart(); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() { SolarMutexGuard aGuard; @@ -1426,7 +1426,7 @@ namespace accessibility return OCommonAccessibleText::getSelectionEnd(); } - sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -1446,7 +1446,7 @@ namespace accessibility } } - OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getText() { SolarMutexGuard aGuard; @@ -1456,7 +1456,7 @@ namespace accessibility return OCommonAccessibleText::getText(); } - OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -1697,7 +1697,7 @@ namespace accessibility } } - css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -1812,7 +1812,7 @@ namespace accessibility return aResult; } - css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -1977,7 +1977,7 @@ namespace accessibility return aResult; } - css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -2101,7 +2101,7 @@ namespace accessibility return aResult; } - sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -2145,7 +2145,7 @@ namespace accessibility } // XAccessibleEditableText - sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -2182,7 +2182,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -2217,7 +2217,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -2258,7 +2258,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -2298,7 +2298,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) { SolarMutexGuard aGuard; @@ -2341,7 +2341,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) { SolarMutexGuard aGuard; @@ -2400,7 +2400,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText ) { SolarMutexGuard aGuard; @@ -2411,7 +2411,6 @@ namespace accessibility // XAccessibleTextAttributes uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getDefaultAttributes( const uno::Sequence< OUString >& rRequestedAttributes ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2508,8 +2507,6 @@ namespace accessibility uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& rRequestedAttributes ) - throw (beans::UnknownPropertyException, lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2597,7 +2594,7 @@ namespace accessibility } // XAccessibleHypertext - ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount( ) throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount( ) { SvxAccessibleTextAdapter& rT = GetTextForwarder(); const sal_Int32 nPara = GetParagraphIndex(); @@ -2613,7 +2610,7 @@ namespace accessibility return nHyperLinks; } - css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex ) { css::uno::Reference< css::accessibility::XAccessibleHyperlink > xRef; @@ -2644,7 +2641,7 @@ namespace accessibility return xRef; } - ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) { const sal_Int32 nPara = GetParagraphIndex(); SvxAccessibleTextAdapter& rT = GetTextForwarder(); @@ -2671,7 +2668,7 @@ namespace accessibility } // XAccessibleMultiLineText - sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) { sal_Int32 nRes = -1; @@ -2692,7 +2689,7 @@ namespace accessibility } // XAccessibleMultiLineText - css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) { css::accessibility::TextSegment aResult; @@ -2728,7 +2725,7 @@ namespace accessibility } // XAccessibleMultiLineText - css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret( ) throw (uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret( ) { css::accessibility::TextSegment aResult; @@ -2744,7 +2741,7 @@ namespace accessibility } // XAccessibleMultiLineText - sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret( ) throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret( ) { sal_Int32 nRes = -1; @@ -2761,19 +2758,19 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleEditableTextPara::getImplementationName() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getImplementationName() { return OUString("AccessibleEditableTextPara"); } - sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName) { return cppu::supportsService(this, sServiceName); } - uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() { // #105185# Using correct service now return { OUString("com.sun.star.text.AccessibleParagraphView") }; diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index fd4443ccad76..e6e8138b51eb 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -52,12 +52,12 @@ namespace accessibility } // XAccessibleAction - sal_Int32 SAL_CALL AccessibleHyperlink::getAccessibleActionCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleHyperlink::getAccessibleActionCount() { return isValid() ? 1 : 0; } - sal_Bool SAL_CALL AccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) { bool bRet = false; if ( isValid() && ( nIndex == 0 ) ) @@ -68,7 +68,7 @@ namespace accessibility return bRet; } - OUString SAL_CALL AccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) { OUString aDesc; @@ -78,7 +78,7 @@ namespace accessibility return aDesc; } - uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { uno::Reference< css::accessibility::XAccessibleKeyBinding > xKeyBinding; @@ -99,27 +99,27 @@ namespace accessibility } // XAccessibleHyperlink - uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionAnchor( sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionAnchor( sal_Int32 /*nIndex*/ ) { return uno::Any(); } - uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionObject( sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionObject( sal_Int32 /*nIndex*/ ) { return uno::Any(); } - sal_Int32 SAL_CALL AccessibleHyperlink::getStartIndex() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleHyperlink::getStartIndex() { return nStartIdx; } - sal_Int32 SAL_CALL AccessibleHyperlink::getEndIndex() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleHyperlink::getEndIndex() { return nEndIdx; } - sal_Bool SAL_CALL AccessibleHyperlink::isValid( ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleHyperlink::isValid( ) { return rTA.IsValid(); } diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index 08201df3fc85..b1561693b365 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.hxx +++ b/editeng/source/accessibility/AccessibleHyperlink.hxx @@ -53,17 +53,17 @@ namespace accessibility virtual ~AccessibleHyperlink() override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleHyperlink - virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getStartIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEndIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) override; + virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getStartIndex() override; + virtual sal_Int32 SAL_CALL getEndIndex() override; + virtual sal_Bool SAL_CALL isValid() override; }; } // end of namespace accessibility diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 312a6b18ed06..92f82d7ff1e4 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -92,20 +92,20 @@ namespace accessibility } } - uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext( ) throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext( ) { // We implement the XAccessibleContext interface in the same object return uno::Reference< XAccessibleContext > ( this ); } - sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() { return 0; } - uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) { (void)i; @@ -114,25 +114,25 @@ namespace accessibility ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy } - uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleParent() { return mxParent; } - sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() { return mnIndexInParent; } - sal_Int16 SAL_CALL AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException, std::exception) + sal_Int16 SAL_CALL AccessibleImageBullet::getAccessibleRole() { return AccessibleRole::GRAPHIC; } - OUString SAL_CALL AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleImageBullet::getAccessibleDescription() { SolarMutexGuard aGuard; @@ -141,7 +141,7 @@ namespace accessibility return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); } - OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleImageBullet::getAccessibleName() { SolarMutexGuard aGuard; @@ -150,14 +150,14 @@ namespace accessibility return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); } - uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() { // no relations, therefore empty return uno::Reference< XAccessibleRelationSet >(); } - uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() { SolarMutexGuard aGuard; @@ -171,7 +171,7 @@ namespace accessibility return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) ); } - lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) + lang::Locale SAL_CALL AccessibleImageBullet::getLocale() { SolarMutexGuard aGuard; @@ -183,14 +183,14 @@ namespace accessibility return LanguageTag(GetTextForwarder().GetLanguage( GetParagraphIndex(), 0 )).getLocale(); } - void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener ); } - void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) @@ -209,7 +209,7 @@ namespace accessibility } } - sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint ) { SolarMutexGuard aGuard; @@ -224,14 +224,14 @@ namespace accessibility return aRect.IsInside( aPoint ); } - uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) { // as we have no children, empty reference return uno::Reference< XAccessible >(); } - awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds( ) throw (uno::RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds( ) { SolarMutexGuard aGuard; @@ -269,7 +269,7 @@ namespace accessibility return awt::Rectangle(); } - awt::Point SAL_CALL AccessibleImageBullet::getLocation( ) throw (uno::RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleImageBullet::getLocation( ) { SolarMutexGuard aGuard; @@ -279,7 +279,7 @@ namespace accessibility return awt::Point( aRect.X, aRect.Y ); } - awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen( ) { SolarMutexGuard aGuard; @@ -305,7 +305,7 @@ namespace accessibility ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } - awt::Size SAL_CALL AccessibleImageBullet::getSize( ) throw (uno::RuntimeException, std::exception) + awt::Size SAL_CALL AccessibleImageBullet::getSize( ) { SolarMutexGuard aGuard; @@ -315,7 +315,7 @@ namespace accessibility return awt::Size( aRect.Width, aRect.Height ); } - void SAL_CALL AccessibleImageBullet::grabFocus( ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleImageBullet::grabFocus( ) { throw uno::RuntimeException("Not focusable", @@ -323,7 +323,7 @@ namespace accessibility ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } - sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) { // #104444# Added to XAccessibleComponent interface @@ -332,7 +332,7 @@ namespace accessibility return static_cast<sal_Int32>(nColor); } - sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) { // #104444# Added to XAccessibleComponent interface @@ -344,19 +344,19 @@ namespace accessibility return static_cast<sal_Int32>( aColor.GetColor() ); } - OUString SAL_CALL AccessibleImageBullet::getImplementationName() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleImageBullet::getImplementationName() { return OUString("AccessibleImageBullet"); } - sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName) { return cppu::supportsService(this, sServiceName); } - uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames() { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index 900447fa8df5..b08aac51c420 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -39,49 +39,49 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) ); } - void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection( ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection( ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::clearAccessibleSelection(); } - void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren( ) throw (uno::RuntimeException, std::exception) + void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren( ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::selectAllAccessibleChildren(); } - sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) { ::osl::MutexGuard aGuard( implGetMutex() ); return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() ); } - uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) ); } - void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index c4804cf11f2a..3b5226d97115 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -476,26 +476,26 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleStaticTextBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getAccessibleChildCount() { // no children at all return 0; } - uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ ) { // no children at all return uno::Reference< XAccessible >(); } - uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ ) throw (uno::RuntimeException, std::exception) + uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ ) { // no children at all return uno::Reference< XAccessible >(); } // XAccessibleText - sal_Int32 SAL_CALL AccessibleStaticTextBase::getCaretPosition() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getCaretPosition() { SolarMutexGuard aGuard; @@ -509,12 +509,12 @@ namespace accessibility return nPos; } - sal_Bool SAL_CALL AccessibleStaticTextBase::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleStaticTextBase::setCaretPosition( sal_Int32 nIndex ) { return setSelection(nIndex, nIndex); } - sal_Unicode SAL_CALL AccessibleStaticTextBase::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleStaticTextBase::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -523,7 +523,7 @@ namespace accessibility return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex ); } - uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) { SolarMutexGuard aGuard; @@ -535,7 +535,7 @@ namespace accessibility return mpImpl->GetParagraph( aPos.nPara ).getCharacterAttributes( aPos.nIndex, aRequestedAttributes ); } - awt::Rectangle SAL_CALL AccessibleStaticTextBase::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleStaticTextBase::getCharacterBounds( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -553,7 +553,7 @@ namespace accessibility return aBounds; } - sal_Int32 SAL_CALL AccessibleStaticTextBase::getCharacterCount() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getCharacterCount() { SolarMutexGuard aGuard; @@ -565,7 +565,7 @@ namespace accessibility return nCount; } - sal_Int32 SAL_CALL AccessibleStaticTextBase::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getIndexAtPoint( const awt::Point& rPoint ) { SolarMutexGuard aGuard; @@ -592,7 +592,7 @@ namespace accessibility return -1; } - OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() { SolarMutexGuard aGuard; @@ -606,7 +606,7 @@ namespace accessibility return getTextRange( nStart, nEnd ); } - sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionStart() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionStart() { SolarMutexGuard aGuard; @@ -620,7 +620,7 @@ namespace accessibility return nPos; } - sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionEnd() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionEnd() { SolarMutexGuard aGuard; @@ -634,7 +634,7 @@ namespace accessibility return nPos; } - sal_Bool SAL_CALL AccessibleStaticTextBase::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleStaticTextBase::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -645,7 +645,7 @@ namespace accessibility aEndIndex.nPara, aEndIndex.nIndex ); } - OUString SAL_CALL AccessibleStaticTextBase::getText() throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleStaticTextBase::getText() { SolarMutexGuard aGuard; @@ -657,7 +657,7 @@ namespace accessibility return aRes; } - OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -740,7 +740,7 @@ namespace accessibility return aRes; } - css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -791,7 +791,7 @@ namespace accessibility return aResult; } - css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -837,7 +837,7 @@ namespace accessibility return aResult; } - css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aGuard; @@ -878,7 +878,7 @@ namespace accessibility return aResult; } - sal_Bool SAL_CALL AccessibleStaticTextBase::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleStaticTextBase::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aGuard; @@ -893,7 +893,7 @@ namespace accessibility } // XAccessibleTextAttributes - uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< OUString >& RequestedAttributes ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< OUString >& RequestedAttributes ) { // get the intersection of the default attributes of all paragraphs @@ -931,7 +931,7 @@ namespace accessibility return comphelper::containerToSequence(aDefAttrVec); } - uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) { // get those default attributes of the paragraph, which are not part // of the intersection of all paragraphs and add them to the run attributes diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index c72354e3bb16..e9a123afb5bd 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -41,14 +41,14 @@ EditDataObject::~EditDataObject() } // uno::XInterface -uno::Any EditDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any EditDataObject::queryInterface( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } // datatransfer::XTransferable -uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) +uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) { uno::Any aAny; @@ -82,7 +82,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo return aAny; } -uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors( ) { uno::Sequence< datatransfer::DataFlavor > aDataFlavors(4); SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aDataFlavors.getArray()[0] ); @@ -93,7 +93,7 @@ uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors return aDataFlavors; } -sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception) +sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) { bool bSupported = false; diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index 59bc1e9c77de..643ef453e34a 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -47,14 +47,14 @@ public: // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } // css::datatransfer::XTransferable - css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; }; #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 3d271bf3f666..27c28a3beb1f 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1721,8 +1721,6 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect ) } void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& rDGE) - throw (css::uno::RuntimeException, - std::exception) { DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" ); @@ -1805,8 +1803,6 @@ void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestur } void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard aVclGuard; @@ -1900,8 +1896,6 @@ void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent } void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard aVclGuard; @@ -1974,7 +1968,7 @@ void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE } } -void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception) +void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) { SolarMutexGuard aVclGuard; @@ -2001,7 +1995,7 @@ void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEv dragOver( rDTDEE ); } -void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) +void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) { SolarMutexGuard aVclGuard; @@ -2015,8 +2009,6 @@ void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) thr } void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rDTDE) - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard aVclGuard; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 74a55ce39032..35121b5898c2 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -261,20 +261,12 @@ private: protected: // DragAndDropClient - void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) - throw (css::uno::RuntimeException, - std::exception) override; - void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) - throw (css::uno::RuntimeException, - std::exception) override; - void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) - throw (css::uno::RuntimeException, - std::exception) override; - void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override; - void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override; - void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) - throw (css::uno::RuntimeException, - std::exception) override; + void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) override; + void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override; + void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) override; + void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override; + void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override; + void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) override; void ShowDDCursor( const Rectangle& rRect ); void HideDDCursor(); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 9d061416c9c3..d9f52b236e90 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -60,7 +60,6 @@ SvXMLWordListContext::SvXMLWordListContext( css::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) -throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { if ( Element == SvXMLAutoCorrectToken::BLOCK ) return new SvXMLWordContext (rLocalRef, Element, xAttrList); @@ -139,7 +138,6 @@ SvXMLExceptionListContext::SvXMLExceptionListContext( css::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { if ( Element == SvXMLAutoCorrectToken::BLOCK ) return new SvXMLExceptionContext (rLocalRef, Element, xAttrList); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index c27219f70b7b..043fe7c048f9 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -56,8 +56,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; virtual ~SvXMLWordListContext() override; }; @@ -101,8 +100,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; virtual ~SvXMLExceptionListContext() override; }; diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx index caafb84fd495..e097f6621086 100644 --- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx @@ -35,13 +35,11 @@ SvXMLAutoCorrectTokenHandler::~SvXMLAutoCorrectTokenHandler() } sal_Int32 SAL_CALL SvXMLAutoCorrectTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) { return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() ); } Sequence< sal_Int8 > SAL_CALL SvXMLAutoCorrectTokenHandler::getUTF8Identifier( sal_Int32 ) - throw (css::uno::RuntimeException, std::exception) { return Sequence< sal_Int8 >(); } diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx index 9913a0dd9294..a6d858119ae0 100644 --- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx @@ -39,10 +39,8 @@ public: virtual ~SvXMLAutoCorrectTokenHandler() override; //XFastTokenHandler - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override; // Much faster direct C++ shortcut to the method that matters virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index c0a446b4b8fb..f0eeb4e8aa25 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -87,20 +87,16 @@ public: // XSupportedLocales virtual css::uno::Sequence< css::lang::Locale > SAL_CALL - getLocales() - throw(css::uno::RuntimeException, std::exception) override; + getLocales() override; virtual sal_Bool SAL_CALL - hasLocale( const css::lang::Locale& rLocale ) - throw(css::uno::RuntimeException, std::exception) override; + hasLocale( const css::lang::Locale& rLocale ) override; // XThesaurus virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const css::lang::Locale& rLocale, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; }; @@ -141,7 +137,6 @@ void ThesDummy_Impl::GetThes_Impl() uno::Sequence< lang::Locale > SAL_CALL ThesDummy_Impl::getLocales() - throw(uno::RuntimeException, std::exception) { GetThes_Impl(); if (xThes.is()) @@ -154,7 +149,6 @@ uno::Sequence< lang::Locale > SAL_CALL sal_Bool SAL_CALL ThesDummy_Impl::hasLocale( const lang::Locale& rLocale ) - throw(uno::RuntimeException, std::exception) { GetThes_Impl(); if (xThes.is()) @@ -180,8 +174,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL const OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetThes_Impl(); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes; @@ -206,23 +198,17 @@ public: // XSupportedLanguages (for XSpellChecker1) virtual css::uno::Sequence< sal_Int16 > SAL_CALL - getLanguages() - throw(css::uno::RuntimeException, std::exception) override; + getLanguages() override; virtual sal_Bool SAL_CALL - hasLanguage( sal_Int16 nLanguage ) - throw(css::uno::RuntimeException, std::exception) override; + hasLanguage( sal_Int16 nLanguage ) override; // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language) virtual sal_Bool SAL_CALL isValid( const OUString& rWord, sal_Int16 nLanguage, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& rWord, sal_Int16 nLanguage, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; }; @@ -238,7 +224,6 @@ void SpellDummy_Impl::GetSpell_Impl() uno::Sequence< sal_Int16 > SAL_CALL SpellDummy_Impl::getLanguages() - throw(uno::RuntimeException, std::exception) { GetSpell_Impl(); if (xSpell.is()) @@ -250,7 +235,6 @@ uno::Sequence< sal_Int16 > SAL_CALL sal_Bool SAL_CALL SpellDummy_Impl::hasLanguage( sal_Int16 nLanguage ) - throw(uno::RuntimeException, std::exception) { GetSpell_Impl(); bool bRes = false; @@ -263,8 +247,6 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetSpell_Impl(); bool bRes = true; @@ -277,8 +259,6 @@ sal_Bool SAL_CALL uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetSpell_Impl(); uno::Reference< linguistic2::XSpellAlternatives > xRes; @@ -303,11 +283,9 @@ public: // XSupportedLocales virtual css::uno::Sequence< css::lang::Locale > SAL_CALL - getLocales() - throw(css::uno::RuntimeException, std::exception) override; + getLocales() override; virtual sal_Bool SAL_CALL - hasLocale( const css::lang::Locale& rLocale ) - throw(css::uno::RuntimeException, std::exception) override; + hasLocale( const css::lang::Locale& rLocale ) override; // XHyphenator virtual css::uno::Reference< @@ -315,25 +293,19 @@ public: hyphenate( const OUString& rWord, const css::lang::Locale& rLocale, sal_Int16 nMaxLeading, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& rWord, const css::lang::Locale& rLocale, sal_Int16 nIndex, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& rWord, const css::lang::Locale& rLocale, - const css::beans::PropertyValues& rProperties ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyValues& rProperties ) override; }; @@ -349,7 +321,6 @@ void HyphDummy_Impl::GetHyph_Impl() uno::Sequence< lang::Locale > SAL_CALL HyphDummy_Impl::getLocales() - throw(uno::RuntimeException, std::exception) { GetHyph_Impl(); if (xHyph.is()) @@ -361,7 +332,6 @@ uno::Sequence< lang::Locale > SAL_CALL sal_Bool SAL_CALL HyphDummy_Impl::hasLocale( const lang::Locale& rLocale ) - throw(uno::RuntimeException, std::exception) { GetHyph_Impl(); bool bRes = false; @@ -377,8 +347,6 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL const lang::Locale& rLocale, sal_Int16 nMaxLeading, const beans::PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetHyph_Impl(); uno::Reference< linguistic2::XHyphenatedWord > xRes; @@ -394,8 +362,6 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL const lang::Locale& rLocale, sal_Int16 nIndex, const PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetHyph_Impl(); uno::Reference< linguistic2::XHyphenatedWord > xRes; @@ -410,8 +376,6 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL const OUString& rWord, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { GetHyph_Impl(); uno::Reference< linguistic2::XPossibleHyphens > xRes; @@ -431,8 +395,7 @@ public: virtual ~LinguMgrExitLstnr() override; // lang::XEventListener - virtual void SAL_CALL disposing(const EventObject& rSource) - throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& rSource) override; }; LinguMgrExitLstnr::LinguMgrExitLstnr() @@ -456,7 +419,6 @@ LinguMgrExitLstnr::~LinguMgrExitLstnr() } void LinguMgrExitLstnr::disposing(const EventObject& rSource) - throw( RuntimeException, std::exception ) { if (xDesktop.is() && rSource.Source == xDesktop) { diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index 31d30d5471fa..779603096655 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -44,7 +44,6 @@ void SvxUnoForbiddenCharsTable::onChange() } ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lang::Locale& rLocale ) - throw(NoSuchElementException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -60,7 +59,6 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lan } sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& rLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -74,7 +72,6 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& } void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -88,7 +85,6 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLoca } void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& rLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -103,7 +99,6 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& r // XSupportedLocales Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -126,7 +121,6 @@ Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() } sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const lang::Locale& aLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 5a0dddd48186..b6d6b626dec4 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -228,7 +228,7 @@ const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw() return theSvxUnoTextFieldUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -516,7 +516,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() // uno::XInterface uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -534,7 +533,6 @@ uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() - throw (uno::RuntimeException, std::exception) { if( maTypeSequence.getLength() == 0 ) { @@ -553,13 +551,11 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextField::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SvxUnoTextField::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OComponentHelper::queryInterface(rType); } @@ -576,7 +572,6 @@ void SAL_CALL SvxUnoTextField::release() throw( ) // Interface text::XTextField OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bShowCommand) @@ -625,7 +620,6 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand ) // Interface text::XTextContent void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >& xTextRange ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xTextRange ); if(pRange == nullptr) @@ -639,26 +633,22 @@ void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >& } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextField::getAnchor() - throw(uno::RuntimeException, std::exception) { return mxAnchor; } // lang::XComponent void SAL_CALL SvxUnoTextField::dispose() - throw(uno::RuntimeException, std::exception) { OComponentHelper::dispose(); } void SAL_CALL SvxUnoTextField::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::addEventListener(xListener); } void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::removeEventListener(aListener); } @@ -666,14 +656,12 @@ void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang:: // Interface beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextField::getPropertySetInfo( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -730,7 +718,6 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, } uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -777,10 +764,10 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam return aValue; } -void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {} // OComponentHelper void SvxUnoTextField::disposing() @@ -789,13 +776,12 @@ void SvxUnoTextField::disposing() } // lang::XServiceInfo -OUString SAL_CALL SvxUnoTextField::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoTextField::getImplementationName() { return OUString("SvxUnoTextField"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aSeq(4); OUString* pServices = aSeq.getArray(); @@ -871,12 +857,12 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() return aSeq; } -sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) { uno::Reference< uno::XInterface > xRet; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 1970f5fb2c39..0c779fb2965b 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -93,7 +93,6 @@ SvxUnoNumberingRules::~SvxUnoNumberingRules() throw() //XIndexReplace void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -108,7 +107,7 @@ void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno:: } // XIndexAccess -sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() { SolarMutexGuard aGuard; @@ -116,7 +115,6 @@ sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std } Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index ) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -128,39 +126,38 @@ Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index ) //XElementAccess Type SAL_CALL SvxUnoNumberingRules::getElementType() - throw( RuntimeException, std::exception ) { return cppu::UnoType<Sequence< beans::PropertyValue >>::get(); } -sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() { return true; } // XAnyCompare -sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 ) throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 ) { return SvxUnoNumberingRules::Compare( rAny1, rAny2 ); } // XCloneable -Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone( ) { return new SvxUnoNumberingRules(maRule); } -OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) { return OUString( "SvxUnoNumberingRules" ); } -sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) { OUString aService( "com.sun.star.text.NumberingRules" ); Sequence< OUString > aSeq( &aService, 1 ); @@ -168,7 +165,6 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) } Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const - throw (RuntimeException, std::exception) { // NumberingRule aRule; const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex); @@ -266,7 +262,6 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal } void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex) - throw (RuntimeException, IllegalArgumentException, std::exception) { SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); const beans::PropertyValue* pPropArray = rProperties.getConstArray(); @@ -466,7 +461,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert maRule.SetLevel( (sal_uInt16)nIndex, aFmt ); } -const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) throw( IllegalArgumentException ) +const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) { SvxUnoNumberingRules* pRule = SvxUnoNumberingRules::getImplementation( xRule ); if( pRule == nullptr ) @@ -492,10 +487,10 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const Svx class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare > { public: - virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override; }; -sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) { return SvxUnoNumberingRules::Compare( Any1, Any2 ); } diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index bae44d0a982c..a26ddd2123a2 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -41,14 +41,13 @@ SvxAccessibleTextPropertySet::~SvxAccessibleTextPropertySet() throw() { } -uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() throw (uno::RuntimeException, std::exception) +uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() { // TODO (empty?) return uno::Reference< text::XText > (); } uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakObject::queryInterface(rType); } @@ -66,7 +65,7 @@ void SAL_CALL SvxAccessibleTextPropertySet::release() } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() { static ::cppu::OTypeCollection* pTypeCollection = nullptr ; @@ -95,18 +94,17 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr } uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() { return OUString("SvxAccessibleTextPropertySet"); } -sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) { return cppu::supportsService(this, sServiceName); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index d5d809eb1b8e..f3fe061c6f75 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -307,7 +307,6 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw() // Interface XTextRange ( XText ) uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -336,7 +335,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -364,7 +362,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() } OUString SAL_CALL SvxUnoTextRangeBase::getString() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -382,7 +379,6 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString() } void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -409,13 +405,11 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) // Interface beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextRangeBase::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { return mpPropSet->getPropertySetInfo(); } void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (PropertyName == UNO_TR_PROP_SELECTION) { @@ -429,7 +423,6 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName } void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -488,7 +481,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa throw beans::UnknownPropertyException(); } -void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException ) +void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) { if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() )) { @@ -588,7 +581,6 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt } uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& PropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (PropertyName == UNO_TR_PROP_SELECTION) { @@ -605,7 +597,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property } uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -637,7 +628,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert } void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet ) - throw (beans::UnknownPropertyException, uno::RuntimeException) { switch( pMap->nWID ) { @@ -683,7 +673,6 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM } bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) - throw( uno::RuntimeException ) { switch( pMap->nWID ) { @@ -758,18 +747,18 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxIt } // is not (yet) supported -void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} // XMultiPropertySet -void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) { _setPropertyValues( aPropertyNames, aValues ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -888,12 +877,12 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) { return _getPropertyValues( aPropertyNames ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -932,21 +921,20 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons return aValues; } -void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } // beans::XPropertyState beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyState( PropertyName ); } @@ -956,7 +944,6 @@ static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE EE_CHAR_WLM, 0 }; beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { if ( pMap ) { @@ -1048,7 +1035,6 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt } beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1056,13 +1042,11 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUStr } uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextRangeBase::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyStates( aPropertyName ); } uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(const uno::Sequence< OUString >& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { const sal_Int32 nCount = PropertyName.getLength(); const OUString* pNames = PropertyName.getConstArray(); @@ -1193,13 +1177,11 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf } void SAL_CALL SvxUnoTextRangeBase::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { _setPropertyToDefault( PropertyName ); } void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1220,7 +1202,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa } void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { do { @@ -1262,7 +1243,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co } uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1309,7 +1289,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp // beans::XMultiPropertyStates void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1327,7 +1306,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault() } } -void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); for( const OUString* pName = aPropertyNames.getConstArray(); nCount; pName++, nCount-- ) @@ -1336,7 +1315,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); uno::Sequence< uno::Any > ret( nCount ); @@ -1483,13 +1462,11 @@ void SvxUnoTextRangeBase::GotoEnd(bool Expand) throw() // lang::XServiceInfo sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -1504,7 +1481,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames } // XTextRangeCompare -sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) { SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 ); SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 ); @@ -1528,7 +1505,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc } } -sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) { SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 ); SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 ); @@ -1564,7 +1541,6 @@ SvxUnoTextRange::~SvxUnoTextRange() throw() } uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { QUERYINT( text::XTextRange ); else if( rType == cppu::UnoType<beans::XMultiPropertyStates>::get()) @@ -1583,7 +1559,6 @@ uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SvxUnoTextRange::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } @@ -1630,27 +1605,23 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextRange::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextRangeTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextRange::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextRange::getText() - throw(uno::RuntimeException, std::exception) { return xParentText; } // lang::XServiceInfo OUString SAL_CALL SvxUnoTextRange::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextRange"); } @@ -1690,7 +1661,6 @@ SvxUnoTextBase::~SvxUnoTextBase() throw() // XInterface uno::Any SAL_CALL SvxUnoTextBase::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { QUERYINT( text::XText ); QUERYINT( text::XSimpleText ); @@ -1751,13 +1721,11 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextBaseTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1773,14 +1741,12 @@ uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection( // XSimpleText uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new SvxUnoTextCursor( *this ); } uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByRange( const uno::Reference< text::XTextRange >& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1797,7 +1763,6 @@ uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByR } void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1829,7 +1794,6 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan } void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1917,7 +1881,6 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text // XText void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTextRange >& xRange, const uno::Reference< text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1953,14 +1916,13 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe xPropSet->setPropertyValue(UNO_TR_PROP_SELECTION, uno::makeAny(aSel)); } -void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) throw(container::NoSuchElementException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) { } // XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1975,23 +1937,21 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText() } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getStart() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getStart(); } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getEnd() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getEnd(); } -OUString SAL_CALL SvxUnoTextBase::getString() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTextBase::getString() { return SvxUnoTextRangeBase::getString(); } -void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) { SvxUnoTextRangeBase::setString(aString); } @@ -1999,7 +1959,6 @@ void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::Ru // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2012,12 +1971,12 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumera } // XElementAccess ( container::XEnumerationAccess ) -uno::Type SAL_CALL SvxUnoTextBase::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SvxUnoTextBase::getElementType( ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) { SolarMutexGuard aGuard; @@ -2033,7 +1992,6 @@ sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException, s // text::XTextRangeMover void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRange >&, sal_Int16 ) - throw(uno::RuntimeException, std::exception) { } @@ -2046,7 +2004,6 @@ void SvxPropertyValuesToItemSet( const SfxItemPropertySet *pPropSet, SvxTextForwarder *pForwarder /*needed for WID_NUMLEVEL*/, sal_Int32 nPara /*needed for WID_NUMLEVEL*/) - throw(lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { sal_Int32 nProps = rPropertyVaules.getLength(); const beans::PropertyValue *pProps = rPropertyVaules.getConstArray(); @@ -2116,7 +2073,6 @@ void SvxPropertyValuesToItemSet( uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInsert( const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange >& /*rTextRange*/ ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRet; return xRet; @@ -2124,7 +2080,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInser uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2156,7 +2111,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( const OUString& /*rText*/, const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange>& /*rTextRange*/ ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRet; return xRet; @@ -2166,7 +2120,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( const OUString& rText, const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2203,7 +2156,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( } void SvxUnoTextBase::copyText( - const uno::Reference< text::XTextCopy >& xSource ) throw ( uno::RuntimeException, std::exception ) + const uno::Reference< text::XTextCopy >& xSource ) { SolarMutexGuard aGuard; uno::Reference< lang::XUnoTunnel > xUT( xSource, uno::UNO_QUERY ); @@ -2235,13 +2188,11 @@ void SvxUnoTextBase::copyText( // lang::XServiceInfo OUString SAL_CALL SvxUnoTextBase::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextBase"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames( ) - throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -2272,7 +2223,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI return nullptr; } -sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -2306,7 +2257,7 @@ SvxUnoText::~SvxUnoText() throw() } // uno::XInterface -uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) { uno::Any aAny( SvxUnoTextBase::queryAggregation( rType ) ); if( !aAny.hasValue() ) @@ -2315,7 +2266,7 @@ uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( return aAny; } -uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType ) { return OWeakAggObject::queryInterface( rType ); } @@ -2331,12 +2282,12 @@ void SAL_CALL SvxUnoText::release() throw( ) } // lang::XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes( ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes( ) { return SvxUnoTextBase::getTypes(); } -uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -2351,7 +2302,7 @@ const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw() return theSvxUnoTextUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index e56443a1bea2..f1809e8dc25a 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -55,7 +55,6 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw() // container::XEnumeration sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if( mpEditSource && mpEditSource->GetTextForwarder() ) @@ -64,7 +63,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() return false; } -uno::Any SvxUnoTextContentEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +uno::Any SvxUnoTextContentEnumeration::nextElement() { SolarMutexGuard aGuard; @@ -127,7 +126,7 @@ SvxUnoTextContent::~SvxUnoTextContent() throw() } // uno::XInterface -uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) { QUERYINT( text::XTextRange ); else QUERYINT( beans::XMultiPropertyStates ); @@ -146,7 +145,7 @@ uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) return OWeakAggObject::queryAggregation( rType ); } -uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) { return OWeakAggObject::queryInterface(rType); } @@ -193,13 +192,11 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextContent::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextContentTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -207,18 +204,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId() // text::XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextContent::getText() - throw(uno::RuntimeException, std::exception) { return mxParentText; } // text::XTextContent void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { } -uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() { return uno::Reference< text::XTextRange >::query( mxParentText ); } @@ -226,7 +221,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw // XComponent void SAL_CALL SvxUnoTextContent::dispose() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -244,13 +238,11 @@ void SAL_CALL SvxUnoTextContent::dispose() } void SAL_CALL SvxUnoTextContent::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { maDisposeListeners.addInterface(xListener); } void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { maDisposeListeners.removeInterface(aListener); } @@ -258,7 +250,6 @@ void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnumeration( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -268,13 +259,11 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnum // XElementAccess ( container::XEnumerationAccess ) uno::Type SAL_CALL SvxUnoTextContent::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL SvxUnoTextContent::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -294,24 +283,22 @@ sal_Bool SAL_CALL SvxUnoTextContent::hasElements() // XPropertySet void SAL_CALL SvxUnoTextContent::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { _setPropertyValue( aPropertyName, aValue, mnParagraph ); } uno::Any SAL_CALL SvxUnoTextContent::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { return _getPropertyValue( PropertyName, mnParagraph ); } // XMultiPropertySet -void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) { _setPropertyValues( aPropertyNames, aValues, mnParagraph ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) { return _getPropertyValues( aPropertyNames, mnParagraph ); } @@ -335,19 +322,16 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextConte // beans::XPropertyState beans::PropertyState SAL_CALL SvxUnoTextContent::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyState( PropertyName, mnParagraph ); } uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextContent::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyStates( aPropertyName, mnParagraph ); } void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { _setPropertyToDefault( PropertyName, mnParagraph ); } @@ -355,13 +339,11 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN // lang::XServiceInfo OUString SAL_CALL SvxUnoTextContent::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextContent"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties", @@ -404,7 +386,6 @@ SvxUnoTextRangeEnumeration::~SvxUnoTextRangeEnumeration() throw() // container::XEnumeration sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -412,7 +393,6 @@ sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements() } uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement() - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -475,7 +455,6 @@ SvxUnoTextCursor::~SvxUnoTextCursor() throw() // Please use the XTypeProvider! //sal_Bool SvxUnoTextCursor::queryInterface( uno::Uik aUIK, Reference< uno::XInterface > & xRef) uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<text::XTextRange>::get()) return uno::makeAny(uno::Reference< text::XTextRange >(static_cast<SvxUnoTextRangeBase *>(this))); @@ -493,7 +472,6 @@ uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SvxUnoTextCursor::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } @@ -538,69 +516,59 @@ namespace // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxUnoTextCursor::getTypes() - throw(uno::RuntimeException, std::exception) { return theSvxUnoTextCursorTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // text::XTextCursor void SAL_CALL SvxUnoTextCursor::collapseToStart() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CollapseToStart(); } void SAL_CALL SvxUnoTextCursor::collapseToEnd() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CollapseToEnd(); } sal_Bool SAL_CALL SvxUnoTextCursor::isCollapsed() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return IsCollapsed(); } sal_Bool SAL_CALL SvxUnoTextCursor::goLeft( sal_Int16 nCount, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GoLeft( nCount, bExpand ); } sal_Bool SAL_CALL SvxUnoTextCursor::goRight( sal_Int16 nCount, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GoRight( nCount, bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoStart( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GotoStart( bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoEnd( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GotoEnd( bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRange >& xRange, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { if( !xRange.is() ) return; @@ -623,44 +591,42 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang } // text::XTextRange (rest in SvxTextRange) -uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() { return mxParentText; } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getStart() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getStart(); } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getEnd() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getEnd(); } -OUString SAL_CALL SvxUnoTextCursor::getString() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTextCursor::getString() { return SvxUnoTextRangeBase::getString(); } -void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) { SvxUnoTextRangeBase::setString(aString); } // lang::XServiceInfo -OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoTextCursor::getImplementationName() { return OUString("SvxUnoTextCursor"); } -sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() { uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties", diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 710f0accd6c6..dfdba2f8c8a0 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -131,33 +131,33 @@ public: SvxSimpleUnoModel(); // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; // XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) override; // XAnyCompareFactory - virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override; // XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) override; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual void SAL_CALL lockControllers( ) override; + virtual void SAL_CALL unlockControllers( ) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) override; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; }; @@ -167,7 +167,6 @@ SvxSimpleUnoModel::SvxSimpleUnoModel() // XMultiServiceFactory ( SvxFmMSFactory ) uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { if( aServiceSpecifier == "com.sun.star.text.NumberingRules" ) { @@ -185,12 +184,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co } -uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) +uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& ) { return createInstance( ServiceSpecifier ); } -Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) { Sequence< OUString > aSeq; return aSeq; @@ -198,7 +197,6 @@ Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) th // XAnyCompareFactory uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCompareByName( const OUString& PropertyName ) - throw(uno::RuntimeException, std::exception) { (void)PropertyName; return SvxCreateNumRuleCompare(); @@ -206,64 +204,63 @@ uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCom // XStyleFamiliesSupplier uno::Reference< container::XNameAccess > SAL_CALL SvxSimpleUnoModel::getStyleFamilies( ) - throw(uno::RuntimeException, std::exception) { uno::Reference< container::XNameAccess > xStyles; return xStyles; } // XModel -sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) { (void)aURL; (void)aArgs; return false; } -OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL SvxSimpleUnoModel::getURL( ) { OUString aStr; return aStr; } -css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs( ) throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs( ) { Sequence< beans::PropertyValue > aSeq; return aSeq; } -void SAL_CALL SvxSimpleUnoModel::connectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::connectController( const css::uno::Reference< css::frame::XController >& ) { } -void SAL_CALL SvxSimpleUnoModel::disconnectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::disconnectController( const css::uno::Reference< css::frame::XController >& ) { } -void SAL_CALL SvxSimpleUnoModel::lockControllers( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::lockControllers( ) { } -void SAL_CALL SvxSimpleUnoModel::unlockControllers( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::unlockControllers( ) { } -sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked( ) { return true; } -css::uno::Reference< css::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController( ) throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController( ) { uno::Reference< frame::XController > xRet; return xRet; } -void SAL_CALL SvxSimpleUnoModel::setCurrentController( const css::uno::Reference< css::frame::XController >& ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::setCurrentController( const css::uno::Reference< css::frame::XController >& ) { } -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection( ) { uno::Reference< XInterface > xRet; return xRet; @@ -271,15 +268,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurre // XComponent -void SAL_CALL SvxSimpleUnoModel::dispose( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::dispose( ) { } -void SAL_CALL SvxSimpleUnoModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { } -void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { } |