summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /starmath
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/unomodel.hxx26
-rw-r--r--starmath/source/accessibility.cxx70
-rw-r--r--starmath/source/accessibility.hxx134
-rw-r--r--starmath/source/mathmlexport.cxx1
-rw-r--r--starmath/source/mathmlexport.hxx2
-rw-r--r--starmath/source/mathmlimport.cxx5
-rw-r--r--starmath/source/mathmlimport.hxx6
-rw-r--r--starmath/source/register.hxx8
-rw-r--r--starmath/source/smdetect.cxx10
-rw-r--r--starmath/source/smdetect.hxx10
-rw-r--r--starmath/source/unodoc.cxx2
-rw-r--r--starmath/source/unofilter.cxx24
-rw-r--r--starmath/source/unomodel.cxx17
13 files changed, 117 insertions, 198 deletions
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 34133b0fc6cb..4bf5a463b396 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -54,38 +54,36 @@ class SmModel : public SfxBaseModel,
{
std::unique_ptr<SmPrintUIOptions> m_pPrintUIOptions;
protected:
- virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues )
- throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
- throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
+ virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
public:
explicit SmModel( SfxObjectShell *pObjSh );
virtual ~SmModel() throw () override;
//XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire( ) throw() override;
virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
//XRenderable
- virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
+ virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
- virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) override;
// oox::FormulaExportBase
virtual void writeFormulaOoxml(::sax_fastparser::FSHelperPtr pSerializer,
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 8bce95381ab3..03cb93b650d1 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -164,13 +164,11 @@ void SmGraphicAccessible::LaunchEvent(
}
uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessibleContext()
- throw (RuntimeException, std::exception)
{
return this;
}
sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
//! the arguments coordinates are relative to the current window !
//! Thus the top-left point is (0, 0)
@@ -186,7 +184,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint )
uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint(
const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
XAccessible *pRes = nullptr;
@@ -196,7 +193,6 @@ uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint
}
awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -207,7 +203,6 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds()
}
awt::Point SAL_CALL SmGraphicAccessible::getLocation()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -219,7 +214,6 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocation()
}
awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -230,7 +224,6 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
}
awt::Size SAL_CALL SmGraphicAccessible::getSize()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -248,7 +241,6 @@ awt::Size SAL_CALL SmGraphicAccessible::getSize()
}
void SAL_CALL SmGraphicAccessible::grabFocus()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -258,7 +250,6 @@ void SAL_CALL SmGraphicAccessible::grabFocus()
}
sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -268,7 +259,6 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
}
sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -284,20 +274,17 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
}
sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleChildCount()
- throw (RuntimeException, std::exception)
{
return 0;
}
Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleChild(
sal_Int32 /*i*/ )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
throw IndexOutOfBoundsException(); // there is no child...
}
Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -309,7 +296,6 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent()
}
sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Int32 nIdx = -1;
@@ -325,13 +311,11 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent()
}
sal_Int16 SAL_CALL SmGraphicAccessible::getAccessibleRole()
- throw (RuntimeException, std::exception)
{
return AccessibleRole::DOCUMENT;
}
OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
SmDocShell *pDoc = GetDoc_Impl();
@@ -339,14 +323,12 @@ OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription()
}
OUString SAL_CALL SmGraphicAccessible::getAccessibleName()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return aAccName;
}
Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleRelationSet()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper();
@@ -354,7 +336,6 @@ Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleR
}
Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStateSet()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::utl::AccessibleStateSetHelper *pStateSet =
@@ -384,7 +365,6 @@ Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStat
}
Locale SAL_CALL SmGraphicAccessible::getLocale()
- throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
// should be the document language...
@@ -395,7 +375,6 @@ Locale SAL_CALL SmGraphicAccessible::getLocale()
void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -411,7 +390,6 @@ void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -430,13 +408,11 @@ void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
}
sal_Int32 SAL_CALL SmGraphicAccessible::getCaretPosition()
- throw (RuntimeException, std::exception)
{
return 0;
}
sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -446,7 +422,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex )
}
sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -458,7 +433,6 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex )
Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes(
sal_Int32 nIndex,
const uno::Sequence< OUString > & /*rRequestedAttributes*/ )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Int32 nLen = GetAccessibleText_Impl().getLength();
@@ -468,7 +442,6 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri
}
awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -539,14 +512,12 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
}
sal_Int32 SAL_CALL SmGraphicAccessible::getCharacterCount()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return GetAccessibleText_Impl().getLength();
}
sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -609,19 +580,16 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoin
}
OUString SAL_CALL SmGraphicAccessible::getSelectedText()
- throw (RuntimeException, std::exception)
{
return OUString();
}
sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionStart()
- throw (RuntimeException, std::exception)
{
return -1;
}
sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionEnd()
- throw (RuntimeException, std::exception)
{
return -1;
}
@@ -629,7 +597,6 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionEnd()
sal_Bool SAL_CALL SmGraphicAccessible::setSelection(
sal_Int32 nStartIndex,
sal_Int32 nEndIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Int32 nLen = GetAccessibleText_Impl().getLength();
@@ -640,7 +607,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection(
}
OUString SAL_CALL SmGraphicAccessible::getText()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return GetAccessibleText_Impl();
@@ -649,7 +615,6 @@ OUString SAL_CALL SmGraphicAccessible::getText()
OUString SAL_CALL SmGraphicAccessible::getTextRange(
sal_Int32 nStartIndex,
sal_Int32 nEndIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
//!! nEndIndex may be the string length per definition of the interface !!
//!! text should be copied exclusive that end index though. And arguments
@@ -665,7 +630,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
return aTxt.copy( nStart, nEnd - nStart );
}
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -685,7 +650,7 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sa
return aResult;
}
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -706,7 +671,7 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex
return aResult;
}
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -731,7 +696,6 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex
sal_Bool SAL_CALL SmGraphicAccessible::copyText(
sal_Int32 nStartIndex,
sal_Int32 nEndIndex )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
bool bReturn = false;
@@ -761,20 +725,17 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText(
}
OUString SAL_CALL SmGraphicAccessible::getImplementationName()
- throw (RuntimeException, std::exception)
{
return OUString("SmGraphicAccessible");
}
sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
const OUString& rServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return Sequence< OUString >{
"css::accessibility::Accessible",
@@ -1635,7 +1596,6 @@ void SmEditAccessible::ClearWin()
// XAccessible
uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleContext( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return this;
@@ -1643,7 +1603,6 @@ uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleCon
// XAccessibleComponent
sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
//! the arguments coordinates are relative to the current window !
//! Thus the top left-point is (0, 0)
@@ -1658,7 +1617,6 @@ sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint )
}
uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pTextHelper)
@@ -1667,7 +1625,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( c
}
awt::Rectangle SAL_CALL SmEditAccessible::getBounds( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1678,7 +1635,6 @@ awt::Rectangle SAL_CALL SmEditAccessible::getBounds( )
}
awt::Point SAL_CALL SmEditAccessible::getLocation( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1690,7 +1646,6 @@ awt::Point SAL_CALL SmEditAccessible::getLocation( )
}
awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1701,7 +1656,6 @@ awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( )
}
awt::Size SAL_CALL SmEditAccessible::getSize( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1719,7 +1673,6 @@ awt::Size SAL_CALL SmEditAccessible::getSize( )
}
void SAL_CALL SmEditAccessible::grabFocus( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1729,7 +1682,6 @@ void SAL_CALL SmEditAccessible::grabFocus( )
}
sal_Int32 SAL_CALL SmEditAccessible::getForeground()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1739,7 +1691,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getForeground()
}
sal_Int32 SAL_CALL SmEditAccessible::getBackground()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1756,7 +1707,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground()
// XAccessibleContext
sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pTextHelper)
@@ -1765,7 +1715,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount( )
}
uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal_Int32 i )
- throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pTextHelper)
@@ -1774,7 +1723,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal
}
uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (!pWin)
@@ -1786,7 +1734,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( )
}
sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Int32 nIdx = -1;
@@ -1802,19 +1749,16 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( )
}
sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole( )
- throw (RuntimeException, std::exception)
{
return AccessibleRole::PANEL /*TEXT ?*/;
}
OUString SAL_CALL SmEditAccessible::getAccessibleDescription( )
- throw (RuntimeException, std::exception)
{
return OUString(); // empty as agreed with product-management
}
OUString SAL_CALL SmEditAccessible::getAccessibleName( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
// same name as displayed by the window when not docked
@@ -1822,14 +1766,12 @@ OUString SAL_CALL SmEditAccessible::getAccessibleName( )
}
uno::Reference< XAccessibleRelationSet > SAL_CALL SmEditAccessible::getAccessibleRelationSet( )
- throw (RuntimeException, std::exception)
{
Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper();
return xRelSet; // empty relation set
}
uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleStateSet( )
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
::utl::AccessibleStateSetHelper *pStateSet =
@@ -1860,7 +1802,6 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleSt
}
Locale SAL_CALL SmEditAccessible::getLocale( )
- throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
// should be the document language...
@@ -1871,34 +1812,29 @@ Locale SAL_CALL SmEditAccessible::getLocale( )
// XAccessibleEventBroadcaster
void SAL_CALL SmEditAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
if (pTextHelper) // not disposing (about to destroy view shell)
pTextHelper->AddEventListener( xListener );
}
void SAL_CALL SmEditAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
if (pTextHelper) // not disposing (about to destroy view shell)
pTextHelper->RemoveEventListener( xListener );
}
OUString SAL_CALL SmEditAccessible::getImplementationName()
- throw (RuntimeException, std::exception)
{
return OUString("SmEditAccessible");
}
sal_Bool SAL_CALL SmEditAccessible::supportsService(
const OUString& rServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return Sequence< OUString >{
"css::accessibility::Accessible",
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 5e1cb6fe7b47..9c1095fd4df6 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -85,58 +85,58 @@ public:
const css::uno::Any &rNewVal);
// XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override;
+ virtual css::awt::Size SAL_CALL getSize( ) override;
+ virtual void SAL_CALL grabFocus( ) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) override;
+ virtual OUString SAL_CALL getAccessibleName( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
// XAccessibleText
- virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCaretPosition( ) override;
+ virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) override;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) override;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+ virtual OUString SAL_CALL getSelectedText( ) override;
+ virtual sal_Int32 SAL_CALL getSelectionStart( ) override;
+ virtual sal_Int32 SAL_CALL getSelectionEnd( ) override;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+ virtual OUString SAL_CALL getText( ) override;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
@@ -327,39 +327,39 @@ public:
EditView * GetEditView() { return pWin ? pWin->GetEditView() : nullptr; }
// XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override;
+ virtual css::awt::Size SAL_CALL getSize( ) override;
+ virtual void SAL_CALL grabFocus( ) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) override;
+ virtual OUString SAL_CALL getAccessibleName( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index c9a6ca8637da..e3cad9559e5b 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -367,7 +367,6 @@ SmXMLExport::SmXMLExport(
sal_Int64 SAL_CALL SmXMLExport::getSomething(
const uno::Sequence< sal_Int8 >& rId )
-throw(uno::RuntimeException, std::exception)
{
if ( rId.getLength() == 16 &&
0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 7d9adcdc7d75..a706457a83a1 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -99,7 +99,7 @@ public:
OUString const & implementationName, SvXMLExportFlags nExportFlags);
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
void ExportAutoStyles_() override {}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index b080317083a4..99a6127011ae 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -427,7 +427,6 @@ uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames()
uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport(comphelper::getComponentContext(rSMgr), SmXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
}
@@ -446,7 +445,6 @@ throw()
uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportMeta_getImplementationName(), SvXMLImportFlags::META ));
}
@@ -465,14 +463,12 @@ uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames(
uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportSettings_getImplementationName(), SvXMLImportFlags::SETTINGS ));
}
sal_Int64 SAL_CALL SmXMLImport::getSomething(
const uno::Sequence< sal_Int8 >&rId )
-throw(uno::RuntimeException, std::exception)
{
if ( rId.getLength() == 16 &&
0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -483,7 +479,6 @@ throw(uno::RuntimeException, std::exception)
}
void SmXMLImport::endDocument()
- throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
{
//Set the resulted tree into the SmDocShell where it belongs
SmNode *pTree = popOrZero(aNodeStack);
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 3f8f376f3190..addab491ca3f 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -91,12 +91,10 @@ public:
virtual ~SmXMLImport() throw () override;
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- void SAL_CALL endDocument()
- throw( css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL endDocument() override;
SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx
index 49aa33dee750..9cdd82a06bb6 100644
--- a/starmath/source/register.hxx
+++ b/starmath/source/register.hxx
@@ -30,7 +30,7 @@ OUString SAL_CALL
SmDocument_getImplementationName() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >SAL_CALL
- SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags) throw( css::uno::Exception );
+ SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags);
//MathML import
css::uno::Sequence< OUString > SAL_CALL
@@ -39,20 +39,20 @@ OUString SAL_CALL
SmXMLImport_getImplementationName() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+ SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
css::uno::Sequence< OUString > SAL_CALL
SmXMLImportMeta_getSupportedServiceNames() throw();
OUString SAL_CALL
SmXMLImportMeta_getImplementationName() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+ SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
css::uno::Sequence< OUString > SAL_CALL
SmXMLImportSettings_getSupportedServiceNames() throw();
OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+ SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
#endif
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 18dfa736bd51..55283530e86a 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -43,7 +43,7 @@ SmFilterDetect::~SmFilterDetect()
{
}
-OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception )
+OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor )
{
MediaDescriptor aMediaDesc( lDescriptor );
uno::Reference< io::XInputStream > xInStream ( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
@@ -119,19 +119,19 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
}
/* XServiceInfo */
-OUString SAL_CALL SmFilterDetect::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SmFilterDetect::getImplementationName()
{
return impl_getStaticImplementationName();
}
/* XServiceInfo */
-sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName )
{
return cppu::supportsService(this, sServiceName);
}
/* XServiceInfo */
-Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames()
{
return impl_getStaticSupportedServiceNames();
}
@@ -149,7 +149,7 @@ OUString SmFilterDetect::impl_getStaticImplementationName()
}
/* Helper for registry */
-Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
+Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
{
return Reference< XInterface >( *new SmFilterDetect( xServiceManager ) );
}
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index e9c31a378ee1..e3896d784924 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -58,9 +58,9 @@ public:
virtual ~SmFilterDetect() override;
/* XServiceInfo */
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
/* Helper for XServiceInfo */
static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -68,10 +68,10 @@ public:
/* Helper for registry */
/// @throws css::uno::Exception
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XExtendedFilterDetect
- virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
};
#endif
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index df5a5974f4f1..7988beef365a 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -40,7 +40,7 @@ uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw()
}
uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags )
{
SolarMutexGuard aGuard;
SmGlobals::ensure();
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index be7e0a4af5b5..329622dd81b6 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -32,21 +32,21 @@ public:
MathTypeFilter();
// XFilter
- sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
- void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+ void SAL_CALL cancel() override;
// XImporter
- void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
- uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
MathTypeFilter::MathTypeFilter() = default;
-sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw(uno::RuntimeException, std::exception)
+sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescriptor)
{
bool bSuccess = false;
try
@@ -87,26 +87,26 @@ sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDesc
return bSuccess;
}
-void MathTypeFilter::cancel() throw(uno::RuntimeException, std::exception)
+void MathTypeFilter::cancel()
{
}
-void MathTypeFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void MathTypeFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
{
m_xDstDoc = xDoc;
}
-OUString MathTypeFilter::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString MathTypeFilter::getImplementationName()
{
return OUString("com.sun.star.comp.Math.MathTypeFilter");
}
-sal_Bool MathTypeFilter::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+sal_Bool MathTypeFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet =
{
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 63f565190d81..94a1567df14e 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -314,7 +314,7 @@ SmModel::~SmModel() throw ()
{
}
-uno::Any SAL_CALL SmModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SmModel::queryInterface( const uno::Type& rType )
{
uno::Any aRet = ::cppu::queryInterface ( rType,
// OWeakObject interfaces
@@ -341,7 +341,7 @@ void SAL_CALL SmModel::release() throw()
OWeakObject::release();
}
-uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes( ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes( )
{
SolarMutexGuard aGuard;
uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes();
@@ -367,7 +367,6 @@ const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId()
}
sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId )
- throw(uno::RuntimeException, std::exception)
{
if( rId.getLength() == 16
&& 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -389,17 +388,17 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny)
return nRet;
}
-OUString SmModel::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SmModel::getImplementationName()
{
return OUString("com.sun.star.comp.Math.FormulaDocument");
}
-sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SmModel::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence< OUString > SmModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SmModel::getSupportedServiceNames()
{
return uno::Sequence<OUString>{
"com.sun.star.document.OfficeDocument",
@@ -408,7 +407,6 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames() throw( uno::Runtim
}
void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues)
- throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception)
{
SolarMutexGuard aGuard;
@@ -692,7 +690,6 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
}
void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValue )
- throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
{
SmDocShell *pDocSh = static_cast < SmDocShell * > (GetObjectShell());
@@ -904,7 +901,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
sal_Int32 SAL_CALL SmModel::getRendererCount(
const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& /*xOptions*/ )
- throw (IllegalArgumentException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return 1;
@@ -936,7 +932,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer(
sal_Int32 nRenderer,
const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
- throw (IllegalArgumentException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -973,7 +968,6 @@ void SAL_CALL SmModel::render(
sal_Int32 nRenderer,
const uno::Any& rSelection,
const uno::Sequence< beans::PropertyValue >& rxOptions )
- throw (IllegalArgumentException, RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1069,7 +1063,6 @@ void SAL_CALL SmModel::render(
}
void SAL_CALL SmModel::setParent( const uno::Reference< uno::XInterface >& xParent)
- throw( lang::NoSupportException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
SfxBaseModel::setParent( xParent );