cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

1 files changed, 63 insertions, 63 deletions

diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index be4792b0c4bb..63f4c6bd3db7 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -75,11 +75,11 @@ public:
         m_it = m_sheets.begin();
     }
     // XEnumeration
-    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
+    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception)
     {
         return m_it != m_sheets.end();
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
     {
         if ( !hasMoreElements() )
         {
@@ -129,16 +129,16 @@ public:
     }
 
     //XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception)
     {
         return new SelectedSheetsEnum( m_xContext, sheets, m_xModel  );
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception)
     {
         return sheets.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
     {
         if ( Index < 0
         || static_cast< Sheets::size_type >( Index ) >= sheets.size() )
@@ -148,18 +148,18 @@ public:
     }
 
     //XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception)
     {
         return cppu::UnoType<excel::XWorksheet>::get();
     }
 
-    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception)
     {
         return ( !sheets.empty() );
     }
 
     //XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         if ( it == namesToIndices.end() )
@@ -168,7 +168,7 @@ public:
 
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception)
     {
         uno::Sequence< OUString > names( namesToIndices.size() );
         OUString* pString = names.getArray();
@@ -179,7 +179,7 @@ public:
         return names;
     }
 
-    virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
+    virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception)
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         return (it != namesToIndices.end());
@@ -256,19 +256,19 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T
 }
 
 void SAL_CALL
-ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
+ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
 {
     Scroll( Down, Up, ToRight, ToLeft );
 }
 
 void SAL_CALL
-ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
+ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
 {
     Scroll( Down, Up, ToRight, ToLeft, true );
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
+ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) );
     // #FIXME needs a workbook as a parent
@@ -282,7 +282,7 @@ ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
 }
 
 void SAL_CALL
-ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException)
+ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException, std::exception)
 {
 // #TODO #FIXME need some implementation to scroll through the tabs
 // but where is this done?
@@ -302,7 +302,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getCaption() throw (uno::RuntimeException)
+ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception)
 {
     static OUString sCrud(" - OpenOffice.org Calc" );
     static sal_Int32 nCrudLen = sCrud.getLength();
@@ -342,13 +342,13 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException)
+ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException, std::exception)
 {
     getFrameProps()->setPropertyValue( OUString( SC_UNONAME_TITLE ), _caption );
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
+ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nValue = 0;
     // !! TODO !! get view shell from controller
@@ -363,7 +363,7 @@ ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException)
+ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException, std::exception)
 {
     // !! TODO !! get view shell from controller
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
@@ -378,7 +378,7 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
+ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nValue = 0;
     // !! TODO !! get view shell from controller
@@ -393,7 +393,7 @@ ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException)
+ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException, std::exception)
 {
     // !! TODO !! get view shell from controller
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
@@ -408,7 +408,7 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getWindowState() throw (uno::RuntimeException)
+ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nwindowState = xlNormal;
     // !! TODO !! get view shell from controller
@@ -426,7 +426,7 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException)
+ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nwindowState = xlMaximized;
     _windowstate >>= nwindowState;
@@ -448,7 +448,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE
 }
 
 void
-ScVbaWindow::Activate() throw (css::uno::RuntimeException)
+ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception)
 {
     ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
 
@@ -456,35 +456,35 @@ ScVbaWindow::Activate() throw (css::uno::RuntimeException)
 }
 
 void
-ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException)
+ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException, std::exception)
 {
     ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
     workbook.Close(SaveChanges, FileName, RouteWorkBook );
 }
 
 uno::Reference< excel::XPane > SAL_CALL
-ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW );
     return new ScVbaPane( this, mxContext, m_xModel, xViewPane );
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::ActiveCell(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaWindow::ActiveCell(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getActiveCell();
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::Selection(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaWindow::Selection(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getSelection();
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     /*  TODO / FIXME: According to documentation, this method returns the range
         selection even if shapes are selected. */
@@ -492,7 +492,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_SHOWGRID );
     sal_Bool bGrid = sal_True;
@@ -502,14 +502,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException)
 
 
 void SAL_CALL
-ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_SHOWGRID );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_COLROWHDR );
     sal_Bool bHeading = sal_True;
@@ -518,14 +518,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_COLROWHDR );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_HORSCROLL );
     sal_Bool bHorizontalScrollBar = sal_True;
@@ -534,14 +534,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_HORSCROLL );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_OUTLSYMB );
     sal_Bool bOutline = sal_True;
@@ -550,14 +550,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_OUTLSYMB );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_VERTSCROLL );
     sal_Bool bVerticalScrollBar = sal_True;
@@ -566,14 +566,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_VERTSCROLL );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException)
+ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_SHEETTABS );
     sal_Bool bWorkbookTabs = sal_True;
@@ -582,21 +582,21 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException)
+ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException, std::exception)
 {
     OUString sName( SC_UNO_SHEETTABS );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs ));
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getFreezePanes() throw (uno::RuntimeException)
+ScVbaWindow::getFreezePanes() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewFreezable > xViewFreezable( getController(), uno::UNO_QUERY_THROW );
     return xViewFreezable->hasFrozenPanes();
 }
 
 void SAL_CALL
-ScVbaWindow::setFreezePanes( ::sal_Bool _bFreezePanes ) throw (uno::RuntimeException)
+ScVbaWindow::setFreezePanes( ::sal_Bool _bFreezePanes ) throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XViewSplitable > xViewSplitable( xViewPane, uno::UNO_QUERY_THROW );
@@ -627,14 +627,14 @@ ScVbaWindow::setFreezePanes( ::sal_Bool _bFreezePanes ) throw (uno::RuntimeExcep
 }
 
 ::sal_Bool SAL_CALL
-ScVbaWindow::getSplit() throw (uno::RuntimeException)
+ScVbaWindow::getSplit() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getIsWindowSplit();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException)
+ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException, std::exception)
 {
     if( !_bSplit )
     {
@@ -652,14 +652,14 @@ ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException)
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::getSplitColumn() throw (uno::RuntimeException)
+ScVbaWindow::getSplitColumn() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getSplitColumn();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException)
+ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException, std::exception)
 {
     if( getSplitColumn() != _splitcolumn )
     {
@@ -670,14 +670,14 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti
 }
 
 double SAL_CALL
-ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException)
+ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return PixelsToPoints( getDevice(), xViewSplitable->getSplitHorizontal(), sal_True );
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException)
+ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     double fHoriPixels = PointsToPixels( getDevice(), _splithorizontal, sal_True );
@@ -685,14 +685,14 @@ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeEx
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::getSplitRow() throw (uno::RuntimeException)
+ScVbaWindow::getSplitRow() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getSplitRow();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException)
+ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, std::exception)
 {
     if( getSplitRow() != _splitrow )
     {
@@ -703,14 +703,14 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException)
 }
 
 double SAL_CALL
-ScVbaWindow::getSplitVertical() throw (uno::RuntimeException)
+ScVbaWindow::getSplitVertical() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return PixelsToPoints( getDevice(), xViewSplitable->getSplitVertical(), sal_False );
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException)
+ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     double fVertiPixels = PointsToPixels( getDevice(), _splitvertical, sal_False );
@@ -744,7 +744,7 @@ void ScVbaWindow::SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows )
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getZoom() throw (uno::RuntimeException)
+ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< beans::XPropertySet > xProps = getControllerProps();
     OUString sName( SC_UNO_ZOOMTYPE );
@@ -780,14 +780,14 @@ void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom)
 }
 
 uno::Reference< excel::XWorksheet > SAL_CALL
-ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getActiveSheet();
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getView() throw (uno::RuntimeException)
+ScVbaWindow::getView() throw (uno::RuntimeException, std::exception)
 {
     sal_Bool bPageBreak = sal_False;
     sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
@@ -805,7 +805,7 @@ ScVbaWindow::getView() throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException)
+ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
     _view >>= nWindowView;
@@ -828,7 +828,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException)
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::getVisibleRange() throw (uno::RuntimeException)
+ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< container::XIndexAccess > xPanesIA( getController(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XViewPane > xTopLeftPane( xPanesIA->getByIndex( 0 ), uno::UNO_QUERY_THROW );
@@ -837,7 +837,7 @@ ScVbaWindow::getVisibleRange() throw (uno::RuntimeException)
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
     double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000);
@@ -845,7 +845,7 @@ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicE
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
     double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000);
@@ -853,7 +853,7 @@ ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicE
 }
 
 void SAL_CALL
-ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
 {
     // need test, print current active sheet
     // !! TODO !! get view shell from controller
@@ -861,14 +861,14 @@ ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const
 }
 
 void SAL_CALL
-ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
 {
     // need test, print preview current active sheet
     // !! TODO !! get view shell from controller
     PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
 }
 
-double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException)
+double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, std::exception)
 {
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
     if ( pViewShell && pViewShell->GetViewData() && pViewShell->GetViewData()->GetView() )
@@ -880,7 +880,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException)
     return 0.0;
 }
 
-void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::RuntimeException)
+void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::RuntimeException, std::exception)
 {
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
     if ( pViewShell && pViewShell->GetViewData() && pViewShell->GetViewData()->GetView() )