summaryrefslogtreecommitdiff
path: root/editeng/source/uno/unotext2.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /editeng/source/uno/unotext2.cxx
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'editeng/source/uno/unotext2.cxx')
-rw-r--r--editeng/source/uno/unotext2.cxx92
1 files changed, 46 insertions, 46 deletions
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 8741bc4da8bb..5b4cd88f43e5 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -59,7 +59,7 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw()
// container::XEnumeration
sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void)
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
if( mpEditSource && mpEditSource->GetTextForwarder() )
@@ -68,7 +68,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void)
return sal_False;
}
-uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
+uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -131,7 +131,7 @@ SvxUnoTextContent::~SvxUnoTextContent() throw()
}
// uno::XInterface
-uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException )
+uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
{
QUERYINT( text::XTextRange );
else QUERYINT( beans::XMultiPropertyStates );
@@ -150,7 +150,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 )
+uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
{
return OWeakAggObject::queryInterface(rType);
}
@@ -197,7 +197,7 @@ namespace
}
uno::Sequence< uno::Type > SAL_CALL SvxUnoTextContent::getTypes()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return theSvxUnoTextContentTypes::get();
}
@@ -208,7 +208,7 @@ namespace
}
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return theSvxUnoTextContentImplementationId::get().getSeq();
}
@@ -216,18 +216,18 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId()
// text::XTextRange
uno::Reference< text::XText > SAL_CALL SvxUnoTextContent::getText()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return mxParentText;
}
// text::XTextContent
void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& )
- throw(lang::IllegalArgumentException, uno::RuntimeException)
+ throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
}
-uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw( uno::RuntimeException )
+uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw( uno::RuntimeException, std::exception )
{
return uno::Reference< text::XTextRange >::query( mxParentText );
}
@@ -235,7 +235,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw
// XComponent
void SAL_CALL SvxUnoTextContent::dispose()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -253,13 +253,13 @@ void SAL_CALL SvxUnoTextContent::dispose()
}
void SAL_CALL SvxUnoTextContent::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
maDisposeListeners.addInterface(xListener);
}
void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
maDisposeListeners.removeInterface(aListener);
}
@@ -267,7 +267,7 @@ void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang
// XEnumerationAccess
uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnumeration( )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -277,13 +277,13 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnum
// XElementAccess ( container::XEnumerationAccess )
uno::Type SAL_CALL SvxUnoTextContent::getElementType()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return ::getCppuType((const uno::Reference< text::XTextRange >*)0);
}
sal_Bool SAL_CALL SvxUnoTextContent::hasElements()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -303,24 +303,24 @@ 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)
+ 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)
+ 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)
+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)
{
_setPropertyValues( aPropertyNames, aValues, mnParagraph );
}
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException)
+uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception)
{
return _getPropertyValues( aPropertyNames, mnParagraph );
}
@@ -344,19 +344,19 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextConte
// beans::XPropertyState
beans::PropertyState SAL_CALL SvxUnoTextContent::getPropertyState( const OUString& PropertyName )
- throw(beans::UnknownPropertyException, uno::RuntimeException)
+ 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)
+ throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
return _getPropertyStates( aPropertyName, mnParagraph );
}
void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyName )
- throw(beans::UnknownPropertyException, uno::RuntimeException)
+ throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
_setPropertyToDefault( PropertyName, mnParagraph );
}
@@ -364,13 +364,13 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN
// lang::XServiceInfo
OUString SAL_CALL SvxUnoTextContent::getImplementationName()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return OUString("SvxUnoTextContent");
}
uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
comphelper::ServiceInfoHelper::addToSequence( aSeq, 5, "com.sun.star.style.ParagraphProperties",
@@ -413,7 +413,7 @@ SvxUnoTextRangeEnumeration::~SvxUnoTextRangeEnumeration() throw()
// container::XEnumeration
sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
}
uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
- throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -496,7 +496,7 @@ 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)
+ throw(uno::RuntimeException, std::exception)
{
if( rType == ::getCppuType((const uno::Reference< text::XTextRange >*)0) )
return uno::makeAny(uno::Reference< text::XTextRange >((text::XText*)(this)));
@@ -514,7 +514,7 @@ uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType )
}
uno::Any SAL_CALL SvxUnoTextCursor::queryInterface( const uno::Type & rType )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return OWeakAggObject::queryInterface(rType);
}
@@ -559,7 +559,7 @@ namespace
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SvxUnoTextCursor::getTypes()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return theSvxUnoTextCursorTypes::get();
}
@@ -570,63 +570,63 @@ namespace
}
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return theSvxUnoTextCursorImplementationId::get().getSeq();
}
// text::XTextCursor
void SAL_CALL SvxUnoTextCursor::collapseToStart()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
CollapseToStart();
}
void SAL_CALL SvxUnoTextCursor::collapseToEnd()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
CollapseToEnd();
}
sal_Bool SAL_CALL SvxUnoTextCursor::isCollapsed()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return IsCollapsed();
}
sal_Bool SAL_CALL SvxUnoTextCursor::goLeft( sal_Int16 nCount, sal_Bool bExpand )
- throw(uno::RuntimeException)
+ 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)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return GoRight( nCount, bExpand );
}
void SAL_CALL SvxUnoTextCursor::gotoStart( sal_Bool bExpand )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
GotoStart( bExpand );
}
void SAL_CALL SvxUnoTextCursor::gotoEnd( sal_Bool bExpand )
- throw(uno::RuntimeException)
+ 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)
+ throw(uno::RuntimeException, std::exception)
{
if( !xRange.is() )
return;
@@ -649,44 +649,44 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang
}
// text::XTextRange (rest in SvxTextRange)
-uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText(void) throw( uno::RuntimeException )
+uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText(void) throw( uno::RuntimeException, std::exception )
{
return mxParentText;
}
uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getStart()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return SvxUnoTextRangeBase::getStart();
}
uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getEnd()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return SvxUnoTextRangeBase::getEnd();
}
-OUString SAL_CALL SvxUnoTextCursor::getString() throw( uno::RuntimeException )
+OUString SAL_CALL SvxUnoTextCursor::getString() throw( uno::RuntimeException, std::exception )
{
return SvxUnoTextRangeBase::getString();
}
-void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::RuntimeException)
+void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception)
{
SvxUnoTextRangeBase::setString(aString);
}
// lang::XServiceInfo
-OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException)
+OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException, std::exception)
{
return OUString("SvxUnoTextCursor");
}
-sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
{
uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
comphelper::ServiceInfoHelper::addToSequence( aSeq, 4,"com.sun.star.style.ParagraphProperties",