1 files changed, 9 insertions, 18 deletions

diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index ec1d5956043f..c21b1a62cff7 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -89,7 +89,7 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XChild
 
-uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception)
+uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent()
 {
     SolarMutexGuard aGuard;
 
@@ -103,7 +103,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno:
 }
 
 void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ )
-                                    throw(lang::NoSupportException, uno::RuntimeException, std::exception)
 {
     //  hamma nich
     //! Exception oder so ??!
@@ -112,7 +111,6 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>&
 // XSimpleText
 
 uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  Notizen brauchen keine Extrawurst
@@ -121,20 +119,19 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
 
 uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  Notizen brauchen keine Extrawurst
     return GetUnoText().createTextCursorByRange(aTextPosition);
 }
 
-OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAnnotationObj::getString()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getString();
 }
 
-void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAnnotationObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
     GetUnoText().setString(aText);
@@ -142,7 +139,6 @@ void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::Run
 
 void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                             const OUString& aString, sal_Bool bAbsorb )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetUnoText().insertString( xRange, aString, bAbsorb );
@@ -150,25 +146,24 @@ void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRan
 
 void SAL_CALL ScAnnotationObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange,
                                             sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb );
 }
 
-uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getText();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getStart();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getEnd();
@@ -176,7 +171,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::R
 
 // XSheetAnnotation
 
-table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL ScAnnotationObj::getPosition()
 {
     SolarMutexGuard aGuard;
     table::CellAddress aAdr;
@@ -187,7 +182,6 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc
 }
 
 OUString SAL_CALL ScAnnotationObj::getAuthor()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
@@ -195,21 +189,20 @@ OUString SAL_CALL ScAnnotationObj::getAuthor()
 }
 
 OUString SAL_CALL ScAnnotationObj::getDate()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
     return pNote ? pNote->GetDate() : OUString();
 }
 
-sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAnnotationObj::getIsVisible()
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
     return pNote && pNote->IsCaptionShown();
 }
 
-void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible )
 {
     SolarMutexGuard aGuard;
     // show/hide note with undo action
@@ -219,8 +212,6 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru
 
 // XSheetAnnotationShapeSupplier
 uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape()
-                                throw(css::uno::RuntimeException,
-                                      std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference < drawing::XShape > xShape;