diff options
Diffstat (limited to 'sc/source/ui/vba')
114 files changed, 2094 insertions, 2146 deletions
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 7d86430f811c..41f12cec6cfc 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -46,7 +46,7 @@ namespace vba { namespace excel { uno::Reference< sheet::XUnnamedDatabaseRanges > -GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) +GetUnnamedDataBaseRanges( ScDocShell* pShell ) { uno::Reference< frame::XModel > xModel; if ( pShell ) @@ -59,7 +59,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) // returns the XDatabaseRange for the autofilter on sheet (nSheet) // also populates sName with the name of range uno::Reference< sheet::XDatabaseRange > -GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeException ) +GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) { uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( GetUnnamedDataBaseRanges( pShell ), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XDatabaseRange > xDataBaseRange; @@ -77,7 +77,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc return xDataBaseRange; } -ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) throw ( uno::RuntimeException ) +ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) { ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) @@ -88,7 +88,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) { uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -110,26 +110,26 @@ class PasteCellsWarningReseter private: bool bInitialWarningState; /// @throws uno::RuntimeException - static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() throw ( uno::RuntimeException ) + static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() { static uno::Reference< sheet::XGlobalSheetSettings > xProps = sheet::GlobalSheetSettings::create( comphelper::getProcessComponentContext() ); return xProps; } /// @throws uno::RuntimeException - static bool getReplaceCellsWarning() throw ( uno::RuntimeException ) + static bool getReplaceCellsWarning() { return getGlobalSheetSettings()->getReplaceCellsWarning(); } /// @throws uno::RuntimeException - static void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) + static void setReplaceCellsWarning( bool bState ) { getGlobalSheetSettings()->setReplaceCellsWarning( bState ); } public: /// @throws uno::RuntimeException - PasteCellsWarningReseter() throw ( uno::RuntimeException ) + PasteCellsWarningReseter() { bInitialWarningState = getReplaceCellsWarning(); if ( bInitialWarningState ) @@ -254,7 +254,7 @@ getViewFrame( const uno::Reference< frame::XModel >& xModel ) } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); OUString sCodeName; @@ -268,7 +268,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) { uno::Reference< container::XEnumerationAccess > xEnumAccess( xRanges, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration(); @@ -277,7 +277,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& x } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) { uno::Reference< sheet::XSheetCellRange > xSheetRange( xCell, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -285,7 +285,7 @@ getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno: } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) { uno::Reference< sheet::XSpreadsheetDocument > xDoc( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index cd17fede7ae0..7fc8f4da5f66 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -48,23 +48,23 @@ ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XC SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException -css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( css::uno::RuntimeException ); +css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ); /// @throws css::uno::RuntimeException -css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( css::uno::RuntimeException ); +css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ); /// @throws css::uno::RuntimeException -ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); +ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); class ScVbaCellRangeAccess @@ -77,7 +77,7 @@ public: // by default will throw if unsuccessful. /// @throws css::uno::RuntimeException template < typename ImplObject > - ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) throw (css::uno::RuntimeException) + ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) { ImplObject* pObj = nullptr; css::uno::Reference< css::lang::XUnoTunnel > xTunnel( rxWrapperIf, css::uno::UNO_QUERY ); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index a55a99c80987..e4b17f1016cd 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -141,21 +141,21 @@ ScVbaApplication::~ScVbaApplication() } OUString SAL_CALL -ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::getExactName( const OUString& aApproximateName ) { uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getExactName( aApproximateName ); } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException, std::exception) +ScVbaApplication::getIntrospection() { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getIntrospection(); } uno::Any SAL_CALL -ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) { /* When calling the functions directly at the Application object, no runtime errors are thrown, but the error is inserted into the return value. */ @@ -173,35 +173,35 @@ ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno } void SAL_CALL -ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); xWSF->setValue( PropertyName, Value ); } uno::Any SAL_CALL -ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaApplication::getValue( const OUString& PropertyName ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getValue( PropertyName ); } sal_Bool SAL_CALL -ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException, std::exception) +ScVbaApplication::hasMethod( const OUString& Name ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasMethod( Name ); } sal_Bool SAL_CALL -ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException, std::exception) +ScVbaApplication::hasProperty( const OUString& Name ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasProperty( Name ); } uno::Reference< excel::XWorkbook > -ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveWorkbook() { uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY ); @@ -211,7 +211,7 @@ ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::excepti } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getThisWorkbook() { uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY ); @@ -221,13 +221,13 @@ ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception } uno::Reference< XAssistant > SAL_CALL -ScVbaApplication::getAssistant() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getAssistant() { return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) ); } uno::Any SAL_CALL -ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getSelection() { uno::Reference< frame::XModel > xModel( getCurrentDocument() ); @@ -288,7 +288,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception ) +ScVbaApplication::getActiveCell() { uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); @@ -305,7 +305,7 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::International( sal_Int32 /*Index*/ ) { // complete stub for now // #TODO flesh out some of the Indices we could handle @@ -314,7 +314,7 @@ ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeExcept } uno::Any SAL_CALL -ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Workbooks( const uno::Any& aIndex ) { uno::Reference< XCollection > xWorkBooks( new ScVbaWorkbooks( this, mxContext ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -327,20 +327,20 @@ ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Worksheets( const uno::Any& aIndex ) { uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_SET_THROW ); return xWorkbook->Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaApplication::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::WorksheetFunction( ) { return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) ); } uno::Any SAL_CALL -ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Evaluate( const OUString& Name ) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -350,7 +350,7 @@ ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException, } uno::Any -ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Dialogs( const uno::Any &aIndex ) { uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) ); if( !aIndex.hasValue() ) @@ -359,7 +359,7 @@ ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException } uno::Reference< excel::XWindow > SAL_CALL -ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveWindow() { uno::Reference< frame::XModel > xModel = getCurrentDocument(); uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); @@ -369,7 +369,7 @@ ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception } uno::Any SAL_CALL -ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCutCopyMode() { //# FIXME TODO, implementation uno::Any result; @@ -378,19 +378,19 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ ) { //# FIXME TODO, implementation } uno::Any SAL_CALL -ScVbaApplication::getStatusBar() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getStatusBar() { return uno::makeAny( !getDisplayStatusBar() ); } void SAL_CALL -ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) { OUString sText; bool bDefault = false; @@ -418,7 +418,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } ::sal_Int32 SAL_CALL -ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCalculation() { // TODO: in Excel, this is an application-wide setting uno::Reference<sheet::XCalculatable> xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW); @@ -429,7 +429,7 @@ ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) { // TODO: in Excel, this is an application-wide setting uno::Reference< sheet::XCalculatable > xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW); @@ -446,7 +446,7 @@ ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::Runtime } uno::Any SAL_CALL -ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Windows( const uno::Any& aIndex ) { uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( this, mxContext ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -454,7 +454,7 @@ ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xWindows->Item( aIndex, uno::Any() ) ); } void SAL_CALL -ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::wait( double time ) { StarBASIC* pBasic = SfxApplication::GetBasic(); SbxArrayRef aArgs = new SbxArray; @@ -473,14 +473,14 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::excepti } uno::Any SAL_CALL -ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) { uno::Reference< excel::XRange > xVbRange = ScVbaRange::ApplicationRange( mxContext, Cell1, Cell2 ); return uno::makeAny( xVbRange ); } uno::Any SAL_CALL -ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Names( const css::uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); @@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveSheet() { uno::Reference< excel::XWorksheet > result; uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_QUERY ); @@ -530,7 +530,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) * by test excel, it seems Scroll no effect. ??? *******************************************************************************/ void SAL_CALL -ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) { //test Scroll is a boolean bool bScroll = false; @@ -627,7 +627,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } sal_Int32 SAL_CALL -ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCursor() { PointerStyle nPointerStyle = getPointerStyle(getCurrentDocument()); @@ -647,7 +647,7 @@ ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCursor( sal_Int32 _cursor ) { try { @@ -689,7 +689,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, s // #TODO perhaps we should switch the return type depending of the filter // type, e.g. return Calc for Calc and Excel if it's an imported doc OUString SAL_CALL -ScVbaApplication::getName() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getName() { return OUString("Microsoft Excel" ); } @@ -701,44 +701,44 @@ ScVbaApplication::getName() throw (uno::RuntimeException, std::exception) // error message thrown by OpenOffice void SAL_CALL -ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) { mrAppSettings.mbDisplayAlerts = displayAlerts; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayAlerts() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayAlerts() { return mrAppSettings.mbDisplayAlerts; } void SAL_CALL -ScVbaApplication::setEnableEvents(sal_Bool bEnable) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setEnableEvents(sal_Bool bEnable) { mrAppSettings.mbEnableEvents = bEnable; } sal_Bool SAL_CALL -ScVbaApplication::getEnableEvents() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getEnableEvents() { return mrAppSettings.mbEnableEvents; } void SAL_CALL -ScVbaApplication::setEnableCancelKey(sal_Bool bEnable) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setEnableCancelKey(sal_Bool bEnable) { // Stub, does nothing mrAppSettings.mbEnableCancelKey = bEnable; } sal_Bool SAL_CALL -ScVbaApplication::getEnableCancelKey() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getEnableCancelKey() { return mrAppSettings.mbEnableCancelKey; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayFullScreen() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayFullScreen() { SfxViewShell* pShell = excel::getCurrentBestViewShell( mxContext ); if ( pShell ) @@ -747,7 +747,7 @@ ScVbaApplication::getDisplayFullScreen() throw (uno::RuntimeException, std::exc } void SAL_CALL -ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) { // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead @@ -756,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaApplication::getDisplayScrollBars() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayScrollBars() { ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext ); if ( pShell ) @@ -767,7 +767,7 @@ ScVbaApplication::getDisplayScrollBars() throw (uno::RuntimeException, std::exc } void SAL_CALL -ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) { // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -777,49 +777,49 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaApplication::getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayExcel4Menus() { return mrAppSettings.mbExcel4Menus; } void SAL_CALL -ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet ) { mrAppSettings.mbExcel4Menus = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayNoteIndicator() { return mrAppSettings.mbDisplayNoteIndicator; } void SAL_CALL -ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet ) { mrAppSettings.mbDisplayNoteIndicator = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getShowWindowsInTaskbar() { return mrAppSettings.mbShowWindowsInTaskbar; } void SAL_CALL -ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet ) { mrAppSettings.mbShowWindowsInTaskbar = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getIteration() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getIteration() { return SC_MOD()->GetDocOptions().IsIter(); } void SAL_CALL -ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setIteration( sal_Bool bSet ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); @@ -843,7 +843,7 @@ ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeExceptio } void SAL_CALL -ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::RuntimeException, std::exception ) +ScVbaApplication::Calculate() { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XCalculatable > xCalculatable( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -851,7 +851,7 @@ ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::Runtime } /// @throws uno::RuntimeException -static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) +static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) { static uno::Reference< util::XPathSettings > xPathSettings; if ( !xPathSettings.is() ) @@ -861,7 +861,7 @@ static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( return xPathSettings; } -OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (uno::RuntimeException, std::exception) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) { OUString sRetPath; uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext ); @@ -884,7 +884,7 @@ OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (un } void SAL_CALL -ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) { uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext ); OUString aURL; @@ -893,25 +893,25 @@ ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (u } OUString SAL_CALL -ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDefaultFilePath() { return getOfficePath( "Work"); } OUString SAL_CALL -ScVbaApplication::getLibraryPath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getLibraryPath() { return getOfficePath( "Basic"); } OUString SAL_CALL -ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getTemplatesPath() { return getOfficePath( "Template"); } OUString SAL_CALL -ScVbaApplication::getPathSeparator() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getPathSeparator() { return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } @@ -928,7 +928,6 @@ typedef ::std::list< ScRange > ListOfScRange; @throws uno::RuntimeException */ void lclAddToListOfScRange( ListOfScRange& rList, const uno::Any& rArg ) - throw (script::BasicErrorException, uno::RuntimeException) { if( rArg.hasValue() ) { @@ -1035,7 +1034,6 @@ void lclJoinRanges( ListOfScRange& rList ) @throws uno::RuntimeException */ void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg ) - throw (script::BasicErrorException, uno::RuntimeException) { // extract the ranges from the passed argument, will throw on invalid data ListOfScRange aList2; @@ -1078,7 +1076,7 @@ void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg ) uno::Reference< excel::XRange > lclCreateVbaRange( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const ListOfScRange& rList ) throw (uno::RuntimeException, std::exception) + const ListOfScRange& rList ) { ScDocShell* pDocShell = excel::getDocShell( rxModel ); if( !pDocShell ) throw uno::RuntimeException(); @@ -1111,7 +1109,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22, const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26, const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 ) - throw (script::BasicErrorException, uno::RuntimeException, std::exception) { if( !rArg1.is() || !rArg2.is() ) DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() ); @@ -1165,7 +1162,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22, const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26, const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 ) - throw (script::BasicErrorException, uno::RuntimeException, std::exception) { if( !rArg1.is() || !rArg2.is() ) DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() ); @@ -1210,14 +1206,14 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( } double -ScVbaApplication::InchesToPoints( double Inches ) throw (uno::RuntimeException, std::exception ) +ScVbaApplication::InchesToPoints( double Inches ) { double result = ( Inches * 72.0 ); return result; } void -ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Volatile( const uno::Any& aVolatile ) { bool bVolatile = true; aVolatile >>= bVolatile; @@ -1235,7 +1231,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc sal_Bool SAL_CALL ScVbaApplication::getDisplayFormulaBar() - throw (css::uno::RuntimeException, std::exception) { bool bRes = false; ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext ); @@ -1255,7 +1250,6 @@ ScVbaApplication::getDisplayFormulaBar() void SAL_CALL ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar ) - throw(css::uno::RuntimeException, std::exception) { ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext ); if ( pViewShell && ( _displayformulabar != getDisplayFormulaBar() ) ) @@ -1267,7 +1261,7 @@ ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar ) } uno::Any SAL_CALL -ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) { StarBASIC* pBasic = SfxApplication::GetBasic(); SbMethod* pMeth = static_cast<SbMethod*>(pBasic->GetRtl()->Find( "FuncCaller", SbxClassType::Method )); @@ -1283,13 +1277,13 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep } uno::Reference< frame::XModel > -ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) +ScVbaApplication::getCurrentDocument() { return getCurrentExcelDoc(mxContext); } uno::Any SAL_CALL -ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::MenuBars( const uno::Any& aIndex ) { uno::Reference< XCommandBars > xCommandBars( CommandBars( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xMenuBars( new ScVbaMenuBars( this, mxContext, xCommandBars ) ); @@ -1301,7 +1295,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) { try { @@ -1316,7 +1310,7 @@ void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Proc } } -void SAL_CALL ScVbaApplication::Undo() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaApplication::Undo() { uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW ); diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 1b74af2d7492..cc995d0b471f 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,10 +38,10 @@ private: ScVbaAppSettings& mrAppSettings; /// @throws css::uno::RuntimeException - OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException, std::exception ); + OUString getOfficePath( const OUString& sPath ); protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override; public: explicit ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext ); @@ -51,85 +51,83 @@ public: static bool getDocumentEventsEnabled(); // XExactName - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) override; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() override; + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override; // XApplication - virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayFormulaBar() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) - throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) override; + virtual OUString SAL_CALL getDefaultFilePath() override; + virtual OUString SAL_CALL getPathSeparator() override; + virtual OUString SAL_CALL getLibraryPath() override; + virtual OUString SAL_CALL getTemplatesPath() override; + + virtual OUString SAL_CALL getName() override; + virtual sal_Bool SAL_CALL getDisplayAlerts() override; + virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) override; + virtual ::sal_Int32 SAL_CALL getCalculation() override; + virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual sal_Bool SAL_CALL getDisplayFormulaBar() override; + virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) override; + + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override; + virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) override; + virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) override; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) override; + virtual css::uno::Any SAL_CALL getCutCopyMode() override; + virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) override; + virtual css::uno::Any SAL_CALL getStatusBar() override; + virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) override; + virtual ::sal_Int32 SAL_CALL getCursor() override; + virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) override; + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) override; + virtual sal_Bool SAL_CALL getEnableEvents() override; + virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) override; + virtual sal_Bool SAL_CALL getEnableCancelKey() override; + virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) override; + + virtual sal_Bool SAL_CALL getDisplayFullScreen() override; + virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getDisplayScrollBars() override; + virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getDisplayExcel4Menus() override; + virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) override; + + virtual sal_Bool SAL_CALL getDisplayNoteIndicator() override; + virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() override; + virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getIteration() override; + virtual void SAL_CALL setIteration( sal_Bool bSet ) override; + + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL wait( double time ) override; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) override; + virtual void SAL_CALL Calculate() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual double SAL_CALL InchesToPoints( double InchesToPoints ) override; + virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) override; + virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Undo() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 28a114ec4002..13b586d232b4 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -41,59 +41,59 @@ ScVbaAssistant::~ScVbaAssistant() { } -sal_Bool SAL_CALL ScVbaAssistant::getVisible() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaAssistant::getVisible() { return m_bIsVisible; } -void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible ) { m_bIsVisible = bVisible; } -sal_Bool SAL_CALL ScVbaAssistant::getOn() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaAssistant::getOn() { return false; } -void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) { setVisible( bOn ); } ::sal_Int32 SAL_CALL -ScVbaAssistant::getTop() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getTop() { return m_nPointsTop; } void SAL_CALL -ScVbaAssistant::setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setTop( ::sal_Int32 _top ) { m_nPointsTop = _top; } ::sal_Int32 SAL_CALL -ScVbaAssistant::getLeft() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getLeft() { return m_nPointsLeft; } void SAL_CALL -ScVbaAssistant::setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setLeft( ::sal_Int32 _left ) { m_nPointsLeft = _left; } ::sal_Int32 SAL_CALL -ScVbaAssistant::getAnimation() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getAnimation() { return m_nAnimation; } void SAL_CALL -ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) { m_nAnimation = _animation; } OUString SAL_CALL -ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaAssistant::Name( ) { return m_sName; } diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index fea786bd24d5..d6d95a6c01c7 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -42,18 +42,18 @@ public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~ScVbaAssistant() override; // XAssistant - virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getOn() override; + virtual void SAL_CALL setOn( sal_Bool _on ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; + virtual ::sal_Int32 SAL_CALL getTop() override; + virtual void SAL_CALL setTop( ::sal_Int32 _top ) override; + virtual ::sal_Int32 SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( ::sal_Int32 _left ) override; + virtual ::sal_Int32 SAL_CALL getAnimation() override; + virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) override; - virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL Name( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 061f698781a3..517a5d707389 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -46,12 +46,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -62,7 +62,7 @@ public: } uno::Reference< excel::XAxis > -ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) +ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) @@ -116,8 +116,8 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return mCoordinates.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return mCoordinates.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { try { @@ -133,11 +133,11 @@ public: } } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XAxis>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( mCoordinates.size() > 0 ); } @@ -156,19 +156,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un } uno::Type SAL_CALL -ScVbaAxes::getElementType() throw (css::uno::RuntimeException) +ScVbaAxes::getElementType() { return cppu::UnoType<excel::XAxes>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException) +ScVbaAxes::createEnumeration() { return new EnumWrapper( m_xIndexAccess ); } uno::Any SAL_CALL -ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::script::BasicErrorException, css::uno::RuntimeException) +ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) { // #TODO map the possible index combinations to a container::XIndexAccess wrapper impl // using a vector of valid std::pair maybe? diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index e638eded5db8..b0d8fa85a6f5 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -30,17 +30,17 @@ class ScVbaAxes : public ScVbaAxes_BASE public: ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAXES_HXX diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 1f1349b05f3b..9d21e52baed0 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -34,7 +34,7 @@ const OUString AUTOORIGIN("AutoOrigin"); const OUString VBA_MIN("Max"); const OUString VBA_MAX("Min"); ScVbaChart* -ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) +ScVbaAxis::getChartPtr() { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) @@ -43,7 +43,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) } bool -ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) +ScVbaAxis::isValueAxis() { if ( getType() == xlCategory ) { @@ -61,14 +61,14 @@ ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const un } void SAL_CALL -ScVbaAxis::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::Delete( ) { uno::Reference< lang::XComponent > xComponent( mxPropertySet, uno::UNO_QUERY_THROW ); xComponent->dispose(); } uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL -ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getAxisTitle( ) { uno::Reference< excel::XAxisTitle > xAxisTitle; try @@ -101,20 +101,20 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } ::sal_Int32 SAL_CALL -ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getDisplayUnit( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return -1; } void SAL_CALL -ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) { try { @@ -147,7 +147,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio } } ::sal_Int32 SAL_CALL -ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getCrosses( ) { sal_Int32 nCrosses = xlAxisCrossesCustom; try @@ -181,7 +181,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept } void SAL_CALL -ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setCrossesAt( double _fCrossesAt ) { try { @@ -196,7 +196,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getCrossesAt( ) { double fCrosses = 0.0; try @@ -211,19 +211,19 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setType( ::sal_Int32 _nType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setType( ::sal_Int32 _nType ) { mnType = _nType; } ::sal_Int32 SAL_CALL -ScVbaAxis::getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getType( ) { return mnType; } void SAL_CALL -ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) { try { @@ -249,7 +249,7 @@ ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException } sal_Bool SAL_CALL -ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getHasTitle( ) { bool bHasTitle = false; try @@ -276,7 +276,7 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep } void SAL_CALL -ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinorUnit( double _fMinorUnit ) { try { @@ -290,7 +290,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinorUnit( ) { double fMinor = 1.0; try @@ -306,7 +306,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) { try { @@ -320,7 +320,7 @@ ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::Basic } sal_Bool SAL_CALL -ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinorUnitIsAuto( ) { bool bIsAuto = false; try @@ -338,20 +338,20 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti } void SAL_CALL -ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } sal_Bool SAL_CALL -ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getReversePlotOrder( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return false; } void SAL_CALL -ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMajorUnit( double _fMajorUnit ) { try { @@ -367,7 +367,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMajorUnit( ) { double fMax = 1.0; try @@ -383,7 +383,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) { try { @@ -399,7 +399,7 @@ ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::Basic } sal_Bool SAL_CALL -ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMajorUnitIsAuto( ) { bool bIsAuto = false; try @@ -417,7 +417,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti } void SAL_CALL -ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMaximumScale( double _fMaximumScale ) { try { @@ -433,7 +433,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc } double SAL_CALL -ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMaximumScale( ) { double fMax = 1.0; try @@ -452,7 +452,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE } void SAL_CALL -ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) { try { @@ -467,7 +467,7 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script: } sal_Bool SAL_CALL -ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMaximumScaleIsAuto( ) { bool bIsAuto = false; try @@ -483,7 +483,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru } void SAL_CALL -ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinimumScale( double _fMinimumScale ) { try { @@ -497,7 +497,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc } double SAL_CALL -ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinimumScale( ) { double fMin = 0.0; try @@ -513,7 +513,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE } void SAL_CALL -ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) { try { @@ -529,7 +529,7 @@ ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script: } sal_Bool SAL_CALL -ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinimumScaleIsAuto( ) { bool bIsAuto = false; try @@ -547,13 +547,13 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru } ::sal_Int32 SAL_CALL -ScVbaAxis::getAxisGroup( ) throw (uno::RuntimeException, std::exception) +ScVbaAxis::getAxisGroup( ) { return mnGroup; } void SAL_CALL -ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) { try { @@ -580,7 +580,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } ::sal_Int32 SAL_CALL -ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getScaleType( ) { sal_Int32 nScaleType = xlScaleLinear; try @@ -603,36 +603,36 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce } double SAL_CALL -ScVbaAxis::getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaAxis::getHeight( ) { return oShapeHelper->getHeight(); } -void SAL_CALL ScVbaAxis::setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setHeight( double height ) { oShapeHelper->setHeight( height ); } -double SAL_CALL ScVbaAxis::getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getWidth( ) { return oShapeHelper->getWidth( ); } -void SAL_CALL ScVbaAxis::setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setWidth( double width ) { oShapeHelper->setWidth( width ); } -double SAL_CALL ScVbaAxis::getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getTop( ) { return oShapeHelper->getTop( ); } -void SAL_CALL ScVbaAxis::setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setTop( double top ) { oShapeHelper->setTop( top ); } -double SAL_CALL ScVbaAxis::getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getLeft( ) { return oShapeHelper->getLeft( ); } -void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setLeft( double left ) { oShapeHelper->setLeft( left ); } diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index 12eccc8dd785..88004a31514b 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -33,55 +33,55 @@ class ScVbaAxis : public ScVbaAxis_BASE sal_Int32 mnGroup; bool bCrossesAreCustomized; /// @throws css::uno::RuntimeException - ScVbaChart* getChartPtr() throw( css::uno::RuntimeException ); + ScVbaChart* getChartPtr(); /// @throws css::script::BasicErrorException - bool isValueAxis() throw( css::script::BasicErrorException ); + bool isValueAxis(); std::unique_ptr<ov::ShapeHelper> oShapeHelper; public: ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ); // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCrosses( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getCrossesAt( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMinorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMinorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getReversePlotOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMajorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMajorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMaximumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMaximumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMinimumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMinimumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAxisGroup( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getScaleType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) override; + virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) override; + virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) override; + virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) override; + virtual ::sal_Int32 SAL_CALL getCrosses( ) override; + virtual void SAL_CALL setCrossesAt( double CrossesAt ) override; + virtual double SAL_CALL getCrossesAt( ) override; + virtual void SAL_CALL setType( ::sal_Int32 Type ) override; + virtual ::sal_Int32 SAL_CALL getType( ) override; + virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) override; + virtual sal_Bool SAL_CALL getHasTitle( ) override; + virtual void SAL_CALL setMinorUnit( double MinorUnit ) override; + virtual double SAL_CALL getMinorUnit( ) override; + virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) override; + virtual sal_Bool SAL_CALL getMinorUnitIsAuto( ) override; + virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) override; + virtual sal_Bool SAL_CALL getReversePlotOrder( ) override; + virtual void SAL_CALL setMajorUnit( double MajorUnit ) override; + virtual double SAL_CALL getMajorUnit( ) override; + virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) override; + virtual sal_Bool SAL_CALL getMajorUnitIsAuto( ) override; + virtual void SAL_CALL setMaximumScale( double MaximumScale ) override; + virtual double SAL_CALL getMaximumScale( ) override; + virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) override; + virtual sal_Bool SAL_CALL getMaximumScaleIsAuto( ) override; + virtual void SAL_CALL setMinimumScale( double MinimumScale ) override; + virtual double SAL_CALL getMinimumScale( ) override; + virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) override; + virtual sal_Bool SAL_CALL getMinimumScaleIsAuto( ) override; + virtual ::sal_Int32 SAL_CALL getAxisGroup( ) override; + virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) override; + virtual ::sal_Int32 SAL_CALL getScaleType( ) override; + virtual double SAL_CALL getHeight( ) override; + virtual void SAL_CALL setHeight( double height ) override; + virtual double SAL_CALL getWidth( ) override; + virtual void SAL_CALL setWidth( double width ) override; + virtual double SAL_CALL getTop( ) override; + virtual void SAL_CALL setTop( double top ) override; + virtual double SAL_CALL getLeft( ) override; + virtual void SAL_CALL setLeft( double left ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index c761f43dc993..3737005e9ee9 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -160,14 +160,14 @@ public: ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} // XBorder - uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getColor() override { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); throw uno::RuntimeException("No Implementation available" ); } - void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setColor( const uno::Any& _color ) override { sal_Int32 nColor = 0; _color >>= nColor; @@ -181,7 +181,7 @@ public: throw uno::RuntimeException("No Implementation available" ); } - uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getColorIndex() override { sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; @@ -201,7 +201,7 @@ public: return uno::makeAny(nIndex); } - void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setColorIndex( const uno::Any& _colorindex ) override { sal_Int32 nColor = 0; _colorindex >>= nColor; @@ -209,7 +209,7 @@ public: nColor = 1; setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) ); } - uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getWeight() override { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) @@ -231,7 +231,7 @@ public: } throw uno::RuntimeException("Method failed" ); } - void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setWeight( const uno::Any& _weight ) override { sal_Int32 nWeight = 0; _weight >>= nWeight; @@ -261,12 +261,12 @@ public: throw uno::RuntimeException("Method failed" ); } - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getLineStyle() override { // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) override { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the excel line styles @@ -320,11 +320,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return SAL_N_ELEMENTS( supportedIndexTable ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { sal_Int32 nIndex = getTableIndex( Index ); @@ -335,11 +335,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<excel::XBorder>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -357,12 +357,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -379,7 +379,7 @@ ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, c } uno::Reference< container::XEnumeration > -ScVbaBorders::createEnumeration() throw (uno::RuntimeException) +ScVbaBorders::createEnumeration() { return new RangeBorderEnumWrapper( m_xIndexAccess ); } @@ -391,18 +391,18 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaBorders::getElementType() throw (uno::RuntimeException) +ScVbaBorders::getElementType() { return cppu::UnoType<excel::XBorders>::get(); } uno::Any -ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException) +ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) { return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) ); } -uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getColor() { sal_Int32 count = getCount(); uno::Any color; @@ -422,7 +422,7 @@ uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::ex } return color; } -void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -431,7 +431,7 @@ void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::Runti xBorder->setColor( _color ); } } -uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getColorIndex() { sal_Int32 count = getCount(); uno::Any nColorIndex; @@ -451,7 +451,7 @@ uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, st } return nColorIndex; } -void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -483,7 +483,7 @@ lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell return bRes; } -uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getLineStyle() { table::TableBorder aTableBorder; m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder; @@ -503,7 +503,7 @@ uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std } return uno::makeAny( aLinestyle ); } -void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -512,7 +512,7 @@ void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (un xBorder->setLineStyle( _linestyle ); } } -uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getWeight() { sal_Int32 count = getCount(); uno::Any weight; @@ -532,7 +532,7 @@ uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::e } return weight; } -void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 61076363174d..dafcbe525cf5 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -32,29 +32,29 @@ class ScVbaPalette; class ScVbaBorders : public ScVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) override; bool bRangeIsSingleCell; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: ScVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, ScVbaPalette& rPalette ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XBorders // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getColor() override; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getLineStyle() override; + virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) override; + virtual css::uno::Any SAL_CALL getWeight() override; + virtual void SAL_CALL setWeight( const css::uno::Any& ) override; // xxxxBASE virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 747878e082d6..10ce85c79f12 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) +ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) { Start >>= nStart; if ( nStart < 1 ) @@ -49,41 +49,41 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } OUString SAL_CALL -ScVbaCharacters::getCaption() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getCaption() { return m_xTextRange->getString(); } void SAL_CALL -ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setCaption( const OUString& _caption ) { m_xTextRange->setString( _caption ); } ::sal_Int32 SAL_CALL -ScVbaCharacters::getCount() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getCount() { return getCaption().getLength(); } OUString SAL_CALL -ScVbaCharacters::getText() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getText() { return getCaption(); } void SAL_CALL -ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setText( const OUString& _text ) { setCaption( _text ); } uno::Reference< excel::XFont > SAL_CALL -ScVbaCharacters::getFont() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getFont() { uno::Reference< beans::XPropertySet > xProps( m_xTextRange, uno::UNO_QUERY_THROW ); return uno::Reference< excel::XFont >( new ScVbaFont( this, mxContext, m_aPalette, xProps ) ); } void SAL_CALL -ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) { // #TODO #FIXME needs implementation, or can't be done? throw uno::RuntimeException("Not Implemented" ); @@ -91,13 +91,13 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro // Methods void SAL_CALL -ScVbaCharacters::Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::Insert( const OUString& rString ) { m_xSimpleText->insertString( m_xTextRange, rString, bReplace ); } void SAL_CALL -ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::Delete( ) { // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 552b472fe073..8dc1acd22f91 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -40,20 +40,20 @@ private: public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false ); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& _text ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) override; // Methods - virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Insert( const OUString& String ) override; + virtual void SAL_CALL Delete( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 3919969749d9..e8b93b474614 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -78,7 +78,7 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar } OUString SAL_CALL -ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaChart::getName() { OUString sName; uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW ); @@ -93,13 +93,13 @@ ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaChart::SeriesCollection(const uno::Any&) throw (uno::RuntimeException, std::exception) +ScVbaChart::SeriesCollection(const uno::Any&) { return uno::Any(); } ::sal_Int32 SAL_CALL -ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorException, std::exception) +ScVbaChart::getChartType() { sal_Int32 nChartType = -1; try @@ -218,7 +218,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce } void SAL_CALL -ScVbaChart::setChartType( ::sal_Int32 _nChartType ) throw ( uno::RuntimeException, script::BasicErrorException, std::exception) +ScVbaChart::setChartType( ::sal_Int32 _nChartType ) { try { @@ -543,7 +543,7 @@ try } void SAL_CALL -ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::Activate() { // #TODO how are Chart sheets handled ( I know we don't even consider // them in the worksheets/sheets collections ), but.....??? @@ -558,7 +558,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException } void SAL_CALL -ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) { try { @@ -634,13 +634,13 @@ ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) } void -ScVbaChart::setDefaultChartType() throw ( script::BasicErrorException ) +ScVbaChart::setDefaultChartType() { setChartType( xlColumnClustered ); } void -ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) { try { @@ -665,7 +665,7 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce } ::sal_Int32 SAL_CALL -ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getPlotBy( ) { try { @@ -687,7 +687,7 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept } void -ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException ) +ScVbaChart::setDiagram( const OUString& _sDiagramType ) { try { @@ -705,19 +705,19 @@ ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErro // #TODO find out why we have Location/getLocation? there is afaik no // Location property, just a Location function for the Chart object sal_Int32 SAL_CALL -ScVbaChart::Location() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::Location() { return getLocation(); } sal_Int32 SAL_CALL -ScVbaChart::getLocation() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::getLocation() { return -1; } void SAL_CALL -ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) { // Helper api just stubs out the code <shrug> // #TODO come back and make sense out of this @@ -805,7 +805,7 @@ ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) } sal_Bool SAL_CALL -ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getHasTitle( ) { bool bHasTitle = false; try @@ -820,7 +820,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setHasTitle( sal_Bool bTitle ) { try { @@ -834,7 +834,7 @@ ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, u } sal_Bool SAL_CALL -ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getHasLegend( ) { bool bHasLegend = false; try @@ -849,7 +849,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc } void SAL_CALL -ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setHasLegend( sal_Bool bLegend ) { try { @@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException, } uno::Reference< excel::XChartTitle > SAL_CALL -ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getChartTitle( ) { uno::Reference< drawing::XShape > xTitleShape = mxChartDocument->getTitle(); // #TODO check parent @@ -870,7 +870,7 @@ ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeEx } uno::Any SAL_CALL -ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) { // mmm chart probably is the parent, #TODO check parent uno::Reference< excel::XAxes > xAxes = new ScVbaAxes( this, mxContext, this ); @@ -879,7 +879,7 @@ ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (scrip return xAxes->Item( Type, AxisGroup ); } bool -ScVbaChart::is3D() throw ( uno::RuntimeException ) +ScVbaChart::is3D() { // #TODO perhaps provide limited Debughelper functionality bool is3d = false; @@ -888,7 +888,7 @@ ScVbaChart::is3D() throw ( uno::RuntimeException ) } sal_Int32 -ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( uno::RuntimeException ) +ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) { // #TODO perhaps provide limited Debughelper functionality if (isStacked()) @@ -903,7 +903,7 @@ ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, } bool -ScVbaChart::isStacked() throw ( uno::RuntimeException ) +ScVbaChart::isStacked() { // #TODO perhaps provide limited Debughelper functionality bool bStacked = false; @@ -912,7 +912,7 @@ ScVbaChart::isStacked() throw ( uno::RuntimeException ) } bool -ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException ) +ScVbaChart::is100PercentStacked() { // #TODO perhaps provide limited Debughelper functionality bool b100Percent = false; @@ -921,7 +921,7 @@ ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException ) } sal_Int32 -ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( script::BasicErrorException ) +ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) { try { @@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } sal_Int32 -ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException) +ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) { try { @@ -977,7 +977,7 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw } bool -ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) +ScVbaChart::hasMarkers() { bool bHasMarkers = false; try @@ -995,7 +995,7 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) } sal_Int32 -ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( script::BasicErrorException ) +ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) { if (hasMarkers()) return _nWithMarkers; @@ -1013,7 +1013,7 @@ ScVbaChart::assignDiagramAttributes() } uno::Reference< beans::XPropertySet > -ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) { assignDiagramAttributes(); uno::Reference< beans::XPropertySet > xAxisProps; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 359b5b10cf80..5c4e3171b786 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -51,23 +51,23 @@ friend class ScVbaAxis; static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); /// @throws css::script::BasicErrorException - void setDefaultChartType()throw ( css::script::BasicErrorException ) ; + void setDefaultChartType() ; /// @throws css::script::BasicErrorException - void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); + void setDiagram( const OUString& _sDiagramType); /// @throws css::uno::RuntimeException - bool isStacked() throw ( css::uno::RuntimeException ); + bool isStacked(); /// @throws css::uno::RuntimeException - bool is100PercentStacked() throw ( css::uno::RuntimeException ); + bool is100PercentStacked(); /// @throws css::uno::RuntimeException - sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException ); + sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ); /// @throws css::script::BasicErrorException - sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( css::script::BasicErrorException ); + sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked); /// @throws css::script::BasicErrorException - sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (css::script::BasicErrorException); + sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown); /// @throws css::script::BasicErrorException - bool hasMarkers() throw ( css::script::BasicErrorException ); + bool hasMarkers(); /// @throws css::script::BasicErrorException - sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException ); + sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers); void assignDiagramAttributes(); public: ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ); @@ -75,28 +75,28 @@ public: // Non-interface const css::uno::Reference< css::beans::XPropertySet >& xDiagramPropertySet() const { return mxDiagramPropertySet; } /// @throws css::uno::RuntimeException - bool is3D() throw ( css::uno::RuntimeException ); + bool is3D(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup); // Methods - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasLegend( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPlotBy( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) override; + virtual ::sal_Int32 SAL_CALL getChartType() override; + virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) override; + virtual void SAL_CALL Activate( ) override; + virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) override; + virtual ::sal_Int32 SAL_CALL Location( ) override; + virtual ::sal_Int32 SAL_CALL getLocation( ) override; + virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) override; + virtual sal_Bool SAL_CALL getHasTitle( ) override; + virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) override; + virtual sal_Bool SAL_CALL getHasLegend( ) override; + virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) override; + virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) override; + virtual ::sal_Int32 SAL_CALL getPlotBy( ) override; + virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) override; + virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 3d9778a4f1ad..eec8cdd29c27 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -49,7 +49,7 @@ OUString const & ScVbaChartObject::getPersistName() } uno::Reference< drawing::XShape > -ScVbaChartObject::setShape() throw ( script::BasicErrorException ) +ScVbaChartObject::setShape() { try { @@ -78,21 +78,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) } void SAL_CALL -ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::setName( const OUString& sName ) { xNamedShape->setName(sName); } OUString SAL_CALL -ScVbaChartObject::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::getName() { return xNamedShape->getName(); } void SAL_CALL ScVbaChartObject::Delete() - throw (css::script::BasicErrorException, - css::uno::RuntimeException, std::exception) { // parent of this object is sheet uno::Reference< excel::XWorksheet > xParent( getParent(), uno::UNO_QUERY_THROW ); @@ -105,7 +103,7 @@ ScVbaChartObject::Delete() } void -ScVbaChartObject::Activate() throw ( script::BasicErrorException ) +ScVbaChartObject::Activate() { try { @@ -123,7 +121,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } uno::Reference< excel::XChart > SAL_CALL -ScVbaChartObject::getChart() throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::getChart() { return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index aa6d7f1f5fb9..6bce2f4b54c8 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -45,15 +45,15 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::container::XNamed > xNamedShape; OUString const & getPersistName(); /// @throws css::script::BasicErrorException - css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); + css::uno::Reference< css::drawing::XShape > setShape(); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& sName ) override; + virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() override; + virtual void SAL_CALL Delete() override; /// @throws css::script::BasicErrorException - void Activate() throw ( css::script::BasicErrorException ); + void Activate(); // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 6989795debbf..9e5f5c025714 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -41,8 +41,8 @@ class ChartObjectEnumerationImpl : public EnumerationHelperImpl public: /// @throws uno::RuntimeException - ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} + virtual uno::Any SAL_CALL nextElement( ) override { uno::Any ret; @@ -87,7 +87,7 @@ ScVbaChartObjects::removeByName(const OUString& _sChartName) } uno::Sequence< OUString > -ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ) +ScVbaChartObjects::getChartObjectNames() { uno::Sequence< OUString > sChartNames; try @@ -127,7 +127,7 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException // XChartObjects uno::Any SAL_CALL -ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) throw (script::BasicErrorException, std::exception) +ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) { try { @@ -150,7 +150,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight } return aNULL(); } -void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException, std::exception) +void SAL_CALL ScVbaChartObjects::Delete( ) { uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames(); sal_Int32 ncount = sChartNames.getLength(); @@ -161,7 +161,7 @@ void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException, // XEnumerationAccess uno::Reference< container::XEnumeration > -ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException) +ScVbaChartObjects::createEnumeration() { css::uno::Reference< container::XEnumerationAccess > xEnumAccess( xTableCharts, uno::UNO_QUERY_THROW ); return new ChartObjectEnumerationImpl( mxContext, xEnumAccess->createEnumeration(), xDrawPageSupplier, getParent() /* sheet */); @@ -170,7 +170,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException) // XElementAccess uno::Type -ScVbaChartObjects::getElementType() throw (uno::RuntimeException) +ScVbaChartObjects::getElementType() { return cppu::UnoType<excel::XChartObject>::get(); } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index e62b1ab2634a..915df9d75003 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -42,16 +42,16 @@ public: ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); /// @throws css::script::BasicErrorException - css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException ); + css::uno::Sequence< OUString > getChartObjectNames(); void removeByName(const OUString& _sChartName); // XChartObjects - virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) override; + virtual void SAL_CALL Delete( ) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // ChartObjects_BASE diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 411a15abe0de..bc39a9c6b2dd 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -42,7 +42,7 @@ ScVbaComment::ScVbaComment( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< table::XCellRange >& xRange ) throw( lang::IllegalArgumentException, uno::RuntimeException ) : + const uno::Reference< table::XCellRange >& xRange ) : ScVbaComment_BASE( xParent, xContext ), mxModel( xModel, uno::UNO_SET_THROW ), mxRange( xRange ) @@ -55,7 +55,7 @@ ScVbaComment::ScVbaComment( // private helper functions uno::Reference< sheet::XSheetAnnotation > SAL_CALL -ScVbaComment::getAnnotation() throw (uno::RuntimeException) +ScVbaComment::getAnnotation() { uno::Reference< table::XCell > xCell( mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSheetAnnotationAnchor > xAnnoAnchor( xCell, uno::UNO_QUERY_THROW ); @@ -63,7 +63,7 @@ ScVbaComment::getAnnotation() throw (uno::RuntimeException) } uno::Reference< sheet::XSheetAnnotations > SAL_CALL -ScVbaComment::getAnnotations() throw (uno::RuntimeException) +ScVbaComment::getAnnotations() { uno::Reference< sheet::XSheetCellRange > xSheetCellRange(mxRange, ::uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet(); @@ -73,7 +73,7 @@ ScVbaComment::getAnnotations() throw (uno::RuntimeException) } sal_Int32 SAL_CALL -ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) +ScVbaComment::getAnnotationIndex() { uno::Reference< sheet::XSheetAnnotations > xAnnos = getAnnotations(); table::CellAddress aAddress = getAnnotation()->getPosition(); @@ -98,7 +98,7 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) +ScVbaComment::getCommentByIndex( sal_Int32 Index ) { uno::Reference< container::XIndexAccess > xIndexAccess( getAnnotations(), uno::UNO_QUERY_THROW ); // parent is sheet ( parent of the range which is the parent of the comment ) @@ -110,19 +110,19 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) // public vba functions OUString SAL_CALL -ScVbaComment::getAuthor() throw (uno::RuntimeException, std::exception) +ScVbaComment::getAuthor() { return getAnnotation()->getAuthor(); } void SAL_CALL -ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException, std::exception) +ScVbaComment::setAuthor( const OUString& /*_author*/ ) { // #TODO #FIXME implementation needed } uno::Reference< msforms::XShape > SAL_CALL -ScVbaComment::getShape() throw (uno::RuntimeException, std::exception) +ScVbaComment::getShape() { uno::Reference< sheet::XSheetAnnotationShapeSupplier > xAnnoShapeSupp( getAnnotation(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), uno::UNO_SET_THROW ); @@ -133,39 +133,39 @@ ScVbaComment::getShape() throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -ScVbaComment::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaComment::getVisible() { return getAnnotation()->getIsVisible(); } void SAL_CALL -ScVbaComment::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaComment::setVisible( sal_Bool _visible ) { getAnnotation()->setIsVisible( _visible ); } void SAL_CALL -ScVbaComment::Delete() throw (uno::RuntimeException, std::exception) +ScVbaComment::Delete() { getAnnotations()->removeByIndex( getAnnotationIndex() ); } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::Next() throw (uno::RuntimeException, std::exception) +ScVbaComment::Next() { // index: uno = 0, vba = 1 return getCommentByIndex( getAnnotationIndex() + 2 ); } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::Previous() throw (uno::RuntimeException, std::exception) +ScVbaComment::Previous() { // index: uno = 0, vba = 1 return getCommentByIndex( getAnnotationIndex() ); } OUString SAL_CALL -ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException, std::exception) +ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) { OUString sText; aText >>= sText; diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 5383a8501768..3ee4d4550e27 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -38,13 +38,13 @@ class ScVbaComment : public ScVbaComment_BASE private: /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation() throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations() throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations(); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getAnnotationIndex() throw (css::uno::RuntimeException); + sal_Int32 SAL_CALL getAnnotationIndex(); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ); public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException @@ -52,20 +52,20 @@ public: const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + const css::uno::Reference< css::table::XCellRange >& xRange ); // Attributes - virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAuthor() override; + virtual void SAL_CALL setAuthor( const OUString& _author ) override; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() override; + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 2f92dfff1f6e..b78cc4eacf68 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -46,12 +46,12 @@ public: const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, - const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : + const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel, uno::UNO_SET_THROW ) {} - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement() override { return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel ); } @@ -71,7 +71,7 @@ ScVbaComments::ScVbaComments( // public helper functions uno::Reference< container::XEnumeration > -ScVbaComments::createEnumeration() throw (uno::RuntimeException) +ScVbaComments::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new CommentEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration(), mxModel ); @@ -84,7 +84,7 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaComments::getElementType() throw (uno::RuntimeException) +ScVbaComments::getElementType() { return cppu::UnoType<excel::XComment>::get(); } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 9a7e7315d94a..a45ae2a96f12 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -37,8 +37,8 @@ public: const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 2fe01884caa4..17e2fc901c2b 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -37,7 +37,7 @@ ScVbaCondition< Ifc... >::ScVbaCondition( const uno::Reference< XHelperInterfac template< typename... Ifc > sheet::ConditionOperator -ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) { sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE; sal_Int32 nOperator = 0; @@ -79,21 +79,21 @@ ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw template< typename... Ifc > OUString -ScVbaCondition< Ifc... >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaCondition< Ifc... >::Formula1( ) { return mxSheetCondition->getFormula1(); } template< typename... Ifc > OUString -ScVbaCondition< Ifc... >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaCondition< Ifc... >::Formula2( ) { return mxSheetCondition->getFormula2(); } template< typename... Ifc > void -ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) { OUString sFormula; if ( (_aFormula1 >>= sFormula )) @@ -107,7 +107,7 @@ ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( scrip template< typename... Ifc > sal_Int32 -ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) { sal_Int32 retvalue = -1; sheet::ConditionOperator aConditionalOperator = mxSheetCondition->getOperator(); diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index d5346f2d8f50..bedd0424f161 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -34,15 +34,15 @@ public: ScVbaCondition( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ); /// @throws css::script::BasicErrorException - static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException ); + static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator); - virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE; - virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE; + virtual OUString SAL_CALL Formula1( ) SAL_OVERRIDE; + virtual OUString SAL_CALL Formula2( ) SAL_OVERRIDE; /// @throws css::script::BasicErrorException - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); + virtual void setFormula1( const css::uno::Any& _aFormula1); /// @throws css::script::BasicErrorException - virtual sal_Int32 Operator(bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); - virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE = 0; + virtual sal_Int32 Operator(bool _bIncludeFormulaValue); + virtual sal_Int32 SAL_CALL Operator() SAL_OVERRIDE = 0; }; #endif diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 93460c20c95e..8ab7cafb0415 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; uno::Any -ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception) +ScVbaDialogs::Item( const uno::Any &aItem ) { sal_Int32 nIndex = 0; aItem >>= nIndex; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index dc62a5af18fc..c9e9c657b2b7 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -34,7 +34,7 @@ public: ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 4ffb20e0c84c..0224d7f39d10 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -55,7 +55,7 @@ namespace { @throws lang::IllegalArgumentException @throws uno::RuntimeException */ -SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException) +SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) { VbaEventsHelperBase::checkArgument( rArgs, nIndex ); @@ -127,28 +127,28 @@ public: void stopControllerListening( const uno::Reference< frame::XController >& rxController ); // XTopWindowListener - virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) override; // XWindowListener - virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) override; + virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) override; + virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) override; // XBorderResizeListener - virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) override; private: /** Starts listening to the document model. */ @@ -250,27 +250,27 @@ void ScVbaEventListener::stopControllerListening( const uno::Reference< frame::X } } -void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -291,7 +291,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve } } -void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -307,7 +307,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE } } -void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -319,19 +319,19 @@ void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent } } -void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ ) { ::osl::MutexGuard aGuard( maMutex ); @@ -344,7 +344,7 @@ void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno } } -void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -399,7 +399,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv } } -void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -569,7 +569,7 @@ ScVbaEventsHelper::~ScVbaEventsHelper() { } -void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent ) { static const uno::Sequence< uno::Any > saEmptyArgs; if( (rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC )) || @@ -624,13 +624,11 @@ void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& } OUString ScVbaEventsHelper::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("ScVbaEventsHelper"); } css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.script.vba.VBASpreadsheetEventProcessor"}; @@ -639,7 +637,7 @@ css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames() // protected ------------------------------------------------------------------ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, - const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) throw (uno::RuntimeException) + const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) { // document and document shell are needed during event processing if( !mpShell || !mpDoc ) @@ -689,7 +687,7 @@ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, } uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& rInfo, - const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + const uno::Sequence< uno::Any >& rArgs ) { // fill arguments for workbook events associated to sheet events according to sheet events, sheet will be added below bool bSheetEventAsBookEvent = rInfo.mnEventId > USERDEFINED_START; @@ -780,7 +778,7 @@ uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventH } void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue, - const EventHandlerInfo& rInfo, bool bCancel ) throw (uno::RuntimeException) + const EventHandlerInfo& rInfo, bool bCancel ) { switch( rInfo.mnEventId ) { @@ -801,7 +799,6 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue, OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) const - throw (lang::IllegalArgumentException, uno::RuntimeException) { bool bSheetEvent = false; rInfo.maUserData >>= bSheetEvent; @@ -841,7 +838,7 @@ bool lclSelectionChanged( const ScRangeList& rLeft, const ScRangeList& rRight ) } // namespace -bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException) +bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) { uno::Reference< uno::XInterface > xOldSelection( maOldSelection, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xNewSelection = getXSomethingFromArgs< uno::XInterface >( rArgs, nIndex, false ); @@ -853,7 +850,6 @@ bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rAr } uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // extract sheet index, will throw, if parameter is invalid SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex ); @@ -861,7 +857,6 @@ uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rA } uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // it is possible to pass an existing VBA Range object uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< excel::XRange >( rArgs, nIndex ); @@ -889,7 +884,6 @@ uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, } uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Reference< table::XCell > xCell = getXSomethingFromArgs< table::XCell >( rArgs, nIndex, false ); uno::Sequence< uno::Any > aArgs( 2 ); @@ -900,7 +894,6 @@ uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rA } uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aArgs( 3 ); aArgs[ 0 ] <<= getVBADocument( mxModel ); diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 4e3f33409d29..ce6eb35b8007 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -35,19 +35,17 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ScVbaEventsHelper() override; - virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) override; - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; + virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override; + virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) override; + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const override; private: /** Checks if selection has been changed compared to selection of last call. @@ -55,28 +53,28 @@ private: @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ); /** Creates a VBA Worksheet object (the argument must contain a sheet index). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Range object (the argument must contain a UNO range or UNO range list). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Hyperlink object (the argument must contain a UNO cell). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Window object (the argument must contain a model controller). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; private: ::rtl::Reference< ScVbaEventListener > mxListener; diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index d6525665de18..369d95ee0375 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -41,7 +41,7 @@ ScVbaFont::ScVbaFont( const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< beans::XPropertySet >& xPropertySet, - ScCellRangeObj* pRangeObj, bool bFormControl ) throw ( uno::RuntimeException ) : + ScCellRangeObj* pRangeObj, bool bFormControl ) : ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet, bFormControl ), mPalette( dPalette ), mpRangeObj( pRangeObj ) @@ -59,7 +59,7 @@ ScVbaFont::~ScVbaFont() } /// @throws css::uno::RuntimeException -static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) +static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) { uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW ); uno::Reference< text::XSimpleText > xTxt( xTxtRange->getText(), uno::UNO_QUERY_THROW ) ; @@ -67,7 +67,7 @@ static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< return xProps; } void SAL_CALL -ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setSuperscript( const uno::Any& aValue ) { // #FIXEME create some sort of generic get/set code where // you can pass a functor @@ -110,7 +110,7 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSuperscript() { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -143,7 +143,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setSubscript( const uno::Any& aValue ) { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -184,7 +184,7 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSubscript() { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -218,7 +218,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSize() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_HEIGHT) == SfxItemState::DONTCARE ) @@ -227,7 +227,7 @@ ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setColorIndex( const uno::Any& _colorindex ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -244,7 +244,7 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep } uno::Any SAL_CALL -ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getColorIndex() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_COLOR) == SfxItemState::DONTCARE ) @@ -253,7 +253,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) { //XXX #TODO# #FIXME# //mxFont->setPropertyValue("CharSize", ( uno::Any )fValue ); @@ -262,7 +262,7 @@ ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::Runtime } uno::Any SAL_CALL -ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStandardFontSize() { //XXX #TODO# #FIXME# throw uno::RuntimeException( "getStandardFontSize not supported" ); @@ -270,14 +270,14 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) { //XXX #TODO# #FIXME# throw uno::RuntimeException("setStandardFont not supported" ); } uno::Any SAL_CALL -ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStandardFont() { //XXX #TODO# #FIXME# throw uno::RuntimeException("getStandardFont not supported"); @@ -285,7 +285,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setFontStyle( const uno::Any& aValue ) { bool bBold = false; bool bItalic = false; @@ -316,7 +316,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getFontStyle() { OUStringBuffer aStyles; bool bValue = false; @@ -335,7 +335,7 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getBold() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_WEIGHT) == SfxItemState::DONTCARE ) @@ -344,7 +344,7 @@ ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setUnderline( const uno::Any& aValue ) { // default sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; @@ -378,7 +378,7 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getUnderline() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE) == SfxItemState::DONTCARE ) @@ -405,7 +405,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStrikethrough() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT) == SfxItemState::DONTCARE ) @@ -414,7 +414,7 @@ ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception) +ScVbaFont::getShadow() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_SHADOWED) == SfxItemState::DONTCARE ) @@ -423,7 +423,7 @@ ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getItalic() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_POSTURE) == SfxItemState::DONTCARE ) @@ -433,7 +433,7 @@ ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getName() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getName() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT) == SfxItemState::DONTCARE ) @@ -441,7 +441,7 @@ ScVbaFont::getName() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getName(); } uno::Any -ScVbaFont::getColor() throw (uno::RuntimeException, std::exception) +ScVbaFont::getColor() { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; @@ -450,13 +450,13 @@ ScVbaFont::getColor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setOutlineFont( const uno::Any& aValue ) { mxFont->setPropertyValue("CharContoured", aValue ); } uno::Any SAL_CALL -ScVbaFont::getOutlineFont() throw (uno::RuntimeException, std::exception) +ScVbaFont::getOutlineFont() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR) == SfxItemState::DONTCARE ) diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index d1138acec2c2..4a460e70b3b8 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -43,33 +43,33 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::beans::XPropertySet >& xPropertySet, - ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false ) throw ( css::uno::RuntimeException ); + ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false ); virtual ~ScVbaFont() override;// {} // Attributes - virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getSize() override; + virtual css::uno::Any SAL_CALL getStandardFontSize() override; + virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) override; + virtual css::uno::Any SAL_CALL getStandardFont() override; + virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) override; + virtual css::uno::Any SAL_CALL getFontStyle() override; + virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getBold() override; + virtual css::uno::Any SAL_CALL getUnderline() override; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) override; + virtual css::uno::Any SAL_CALL getStrikethrough() override; + virtual css::uno::Any SAL_CALL getShadow() override; + virtual css::uno::Any SAL_CALL getItalic() override; + virtual css::uno::Any SAL_CALL getSubscript() override; + virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) override; + virtual css::uno::Any SAL_CALL getSuperscript() override; + virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) override; + virtual css::uno::Any SAL_CALL getName() override; + virtual css::uno::Any SAL_CALL getColor() override ; + virtual css::uno::Any SAL_CALL getOutlineFont() override ; + virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) override ; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index db4f2dbe1eed..0d07983d30fc 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -55,7 +55,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, - bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) + bool bCheckAmbiguoity ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), @@ -78,7 +78,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) { try { @@ -116,7 +116,7 @@ ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) thro template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getVerticalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getVerticalAlignment( ) { uno::Any aResult = aNULL(); try @@ -153,7 +153,7 @@ ScVbaFormat< Ifc... >::getVerticalAlignment( ) throw (script::BasicErrorExcepti template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) { try { @@ -193,7 +193,7 @@ ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignme template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getHorizontalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getHorizontalAlignment( ) { uno::Any NRetAlignment = aNULL(); try @@ -234,7 +234,7 @@ ScVbaFormat< Ifc... >::getHorizontalAlignment( ) throw (script::BasicErrorExcep template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) { try { @@ -271,7 +271,7 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (sc } template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getOrientation( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getOrientation( ) { uno::Any NRetOrientation = aNULL(); try @@ -310,7 +310,7 @@ ScVbaFormat< Ifc... >::getOrientation( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) { try { @@ -324,7 +324,7 @@ ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getWrapText( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getWrapText( ) { uno::Any aWrap = aNULL(); try @@ -344,7 +344,7 @@ ScVbaFormat< Ifc... >::getWrapText( ) throw (script::BasicErrorException, uno:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException ) +ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) { ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); uno::Reference< XCollection > xColl = new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette ); @@ -358,7 +358,7 @@ ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErro template< typename... Ifc > uno::Reference< excel::XFont > SAL_CALL -ScVbaFormat< Ifc... >::Font( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::Font( ) { ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet ); @@ -366,14 +366,14 @@ ScVbaFormat< Ifc... >::Font( ) throw (script::BasicErrorException, uno::Runtime template< typename... Ifc > uno::Reference< excel::XInterior > SAL_CALL -ScVbaFormat< Ifc... >::Interior( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::Interior( ) { return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet ); } template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getNumberFormatLocal( ) { uno::Any aRet = uno::makeAny( OUString() ); try @@ -404,7 +404,7 @@ ScVbaFormat< Ifc... >::getNumberFormatLocal( ) throw (script::BasicErrorExcepti template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) { try { @@ -433,7 +433,7 @@ ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) { try { @@ -464,7 +464,7 @@ ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw ( template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) { try { @@ -488,7 +488,7 @@ ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getIndentLevel( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getIndentLevel( ) { uno::Any NRetIndentLevel = aNULL(); try @@ -512,7 +512,7 @@ ScVbaFormat< Ifc... >::getIndentLevel( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) { try { @@ -533,7 +533,7 @@ ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::Basi template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) { try { @@ -553,7 +553,7 @@ ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw ( template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getLocked( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getLocked( ) { uno::Any aCellProtection = aNULL(); try @@ -587,7 +587,7 @@ ScVbaFormat< Ifc... >::getLocked( ) throw (script::BasicErrorException, uno::Ru template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getFormulaHidden( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getFormulaHidden( ) { uno::Any aBoolRet = aNULL(); try @@ -620,7 +620,7 @@ ScVbaFormat< Ifc... >::getFormulaHidden( ) throw (script::BasicErrorException, template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) { try { @@ -635,7 +635,7 @@ ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (scri template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getShrinkToFit( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getShrinkToFit( ) { uno::Any aRet = aNULL(); try @@ -653,7 +653,7 @@ ScVbaFormat< Ifc... >::getShrinkToFit( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) { try { @@ -686,7 +686,7 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (sc template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getReadingOrder( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getReadingOrder( ) { uno::Any NRetReadingOrder = aNULL(); try @@ -718,7 +718,7 @@ ScVbaFormat< Ifc... >::getReadingOrder( ) throw (script::BasicErrorException, u template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getNumberFormat( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getNumberFormat( ) { uno::Any aFormat = aNULL(); try @@ -745,7 +745,7 @@ ScVbaFormat< Ifc... >::getNumberFormat( ) throw (script::BasicErrorException, u template< typename... Ifc > bool -ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException ) +ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) { bool bResult = false; try @@ -762,7 +762,7 @@ ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( scrip template< typename... Ifc > void -ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaFormat< Ifc... >::initializeNumberFormats() { if ( !xNumberFormats.is() ) { @@ -774,7 +774,7 @@ ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorExcep template< typename... Ifc > uno::Reference< beans::XPropertyState > const & -ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException ) +ScVbaFormat< Ifc... >::getXPropertyState() { if ( !xPropertyState.is() ) xPropertyState.set( mxPropertySet, uno::UNO_QUERY_THROW ); @@ -783,14 +783,14 @@ ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException ) template< typename... Ifc > ScCellRangesBase* -ScVbaFormat< Ifc... >::getCellRangesBase() throw ( ::uno::RuntimeException ) +ScVbaFormat< Ifc... >::getCellRangesBase() { return ScCellRangesBase::getImplementation( mxPropertySet ); } template< typename... Ifc > SfxItemSet* -ScVbaFormat< Ifc... >::getCurrentDataSet() throw (uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getCurrentDataSet() { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 604bd6fa4bff..d8bbc897e225 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -48,107 +48,107 @@ protected: bool mbCheckAmbiguoity; bool mbAddIndent; /// @throws css::script::BasicErrorException - bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); + bool isAmbiguous(const OUString& _sPropertyName); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertyState > const & getXPropertyState() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::beans::XPropertyState > const & getXPropertyState(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + void initializeNumberFormats(); /// @throws css::uno::RuntimeException - SfxItemSet* getCurrentDataSet( ) throw (css::uno::RuntimeException, std::exception); + SfxItemSet* getCurrentDataSet( ); protected: /// @throws css::uno::RuntimeException - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ); + virtual ScCellRangesBase* getCellRangesBase(); public: /// @throws css::script::BasicErrorException - ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException ); + ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0; /// @throws css::uno::RuntimeException - void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) throw( css::uno::RuntimeException ) { BAddIndent >>= mbAddIndent; } + void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) { BAddIndent >>= mbAddIndent; } /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); } + css::uno::Any SAL_CALL getAddIndent() { return css::uno::makeAny( mbAddIndent ); } // Interface Methods /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getNumberFormat( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getNumberFormat( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getNumberFormatLocal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getNumberFormatLocal( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getIndentLevel( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getIndentLevel( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getHorizontalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getHorizontalAlignment( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getVerticalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getVerticalAlignment( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getOrientation( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getShrinkToFit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getShrinkToFit( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getWrapText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getWrapText( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setLocked( const css::uno::Any& Locked ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getLocked( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getLocked( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getFormulaHidden( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) = 0; /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getMergeCells( ) = 0; /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getReadingOrder( ); }; #endif diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 17629ed9c68d..36d1fc2a3bec 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; /// @throws css::script::BasicErrorException static ScVbaFormatConditions* -lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException ) +lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); if ( !pFormatConditions ) @@ -40,7 +40,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, - const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ) + const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) @@ -52,7 +52,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa } void SAL_CALL -ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Delete( ) { ScVbaFormatConditions* pFormatConditions = lcl_getScVbaFormatConditionsPtr( moFormatConditions ); pFormatConditions->removeFormatCondition(msStyleName, true); @@ -60,7 +60,7 @@ ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::Runtim } void SAL_CALL -ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) { try { @@ -75,23 +75,23 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } uno::Reference< excel::XInterior > SAL_CALL -ScVbaFormatCondition::Interior( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Interior( ) { return mxStyle->Interior(); } uno::Reference< excel::XFont > SAL_CALL -ScVbaFormatCondition::Font( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Font( ) { return mxStyle->Font(); } uno::Any SAL_CALL -ScVbaFormatCondition::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Borders( const uno::Any& Index ) { return mxStyle->Borders( Index ); } sheet::ConditionOperator -ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) throw ( script::BasicErrorException ) +ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) { sheet::ConditionOperator aAPIType = sheet::ConditionOperator_NONE; switch (_nVBAType) @@ -110,7 +110,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< } void -ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) +ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) { // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax // and if R1C1 convert to A1 @@ -118,7 +118,7 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B } ::sal_Int32 SAL_CALL -ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception ) +ScVbaFormatCondition::Type( ) { sal_Int32 nReturnType = 0; if ( mxSheetCondition->getOperator() == sheet::ConditionOperator_FORMULA) @@ -129,19 +129,19 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime } ::sal_Int32 -ScVbaFormatCondition::Operator( bool bVal ) throw (script::BasicErrorException ) +ScVbaFormatCondition::Operator( bool bVal ) { return ScVbaFormatCondition_BASE::Operator( bVal ); } ::sal_Int32 SAL_CALL -ScVbaFormatCondition::Operator( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormatCondition::Operator( ) { return ScVbaFormatCondition_BASE::Operator( true ); } void -ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) +ScVbaFormatCondition::notifyRange() { try { diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 60a4c8ab92f7..02c0b8c517b2 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -46,23 +46,23 @@ public: const css::uno::Reference< css::sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const css::uno::Reference< ov::excel::XStyle >&, const css::uno::Reference< ov::excel::XFormatConditions >& _xFormatConditions, - const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ); /// @throws css::script::BasicErrorException - void notifyRange() throw ( css::script::BasicErrorException ); + void notifyRange(); /// @throws css::script::BasicErrorException - static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException ); + static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ); //Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 Operator( bool ) throw (css::script::BasicErrorException) override; - virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) override; - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override; + virtual ::sal_Int32 SAL_CALL Type( ) override; + virtual ::sal_Int32 Operator( bool ) override; + virtual ::sal_Int32 SAL_CALL Operator( ) override; + virtual void setFormula1( const css::uno::Any& _aFormula1) override; + virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 6cfebf709b2b..7514695a553e 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -35,7 +35,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; void SAL_CALL -ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatConditions::Delete( ) { try { @@ -58,7 +58,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } uno::Type SAL_CALL -ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException) +ScVbaFormatConditions::getElementType() { return cppu::UnoType<excel::XFormatCondition>::get(); } @@ -93,12 +93,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<excel::XRange >& xRange, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xCollection, const uno::Reference<beans::XPropertySet >& xProps ) : m_xIndexAccess( xIndexAccess ), m_xParentRange( xRange ), m_xContext( xContext ), m_xStyles( xStyles ), m_xParentCollection( xCollection ), m_xProps( xProps ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { try { @@ -131,13 +131,13 @@ public: } uno::Reference< excel::XFormatCondition > SAL_CALL -ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) { return Add( _nType, _aOperator, _aFormula1, _aFormula2, uno::Reference< excel::XStyle >() ); } uno::Reference< excel::XFormatCondition > -ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) { // #TODO // #FIXME @@ -206,13 +206,13 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException) +ScVbaFormatConditions::createEnumeration() { return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet ); } void -ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) +ScVbaFormatConditions::notifyRange() { try { @@ -225,7 +225,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) } OUString -ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) +ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) { // #TODO, #FIXME hook-in proper formula conversion detection & logic OUString sFormula; @@ -245,7 +245,7 @@ ScVbaFormatConditions::getStyleName() } void -ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( script::BasicErrorException ) +ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) { try { diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index c34bc4871132..0978bc1875ab 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -47,22 +47,22 @@ class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatCondit css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; public: /// @throws css::script::BasicErrorException - void notifyRange() throw ( css::script::BasicErrorException ); + void notifyRange(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ); /// @throws css::script::BasicErrorException - static OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + static OUString getA1Formula(const css::uno::Any& _aFormula); OUString getStyleName(); /// @throws css::script::BasicErrorException - void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); + void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle); const css::uno::Reference< css::sheet::XSheetConditionalEntries >& getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index b0159503071f..598390fc8074 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -56,7 +56,7 @@ ScVbaGlobals::~ScVbaGlobals() // XGlobals uno::Reference<excel::XApplication > const & -ScVbaGlobals::getApplication() throw (uno::RuntimeException) +ScVbaGlobals::getApplication() { if ( !mxApplication.is() ) mxApplication.set( new ScVbaApplication( mxContext) ); @@ -64,13 +64,13 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException) } uno::Reference<excel::XApplication > SAL_CALL -ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getExcel() { return getApplication(); } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveWorkbook() { uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY); if ( xWorkbook.is() ) @@ -82,131 +82,131 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWindow > SAL_CALL -ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveWindow() { return getApplication()->getActiveWindow(); } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveSheet() { return getApplication()->getActiveSheet(); } uno::Any SAL_CALL -ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) { return uno::Any( getApplication()->Workbooks(aIndex) ); } uno::Any SAL_CALL -ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::WorkSheets(const uno::Any& aIndex) { return getApplication()->Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Sheets( const uno::Any& aIndex ) { return WorkSheets( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) { return getApplication()->Range( Cell1, Cell2 ); } uno::Any SAL_CALL -ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaGlobals::Names( const css::uno::Any& aIndex ) { return getApplication()->Names( aIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::getActiveCell() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveCell() { return getApplication()->getActiveCell(); } uno::Reference< XAssistant > SAL_CALL -ScVbaGlobals::getAssistant() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getAssistant() { return getApplication()->getAssistant(); } uno::Any SAL_CALL -ScVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getSelection() { return getApplication()->getSelection(); } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getThisWorkbook() { return getApplication()->getThisWorkbook(); } void SAL_CALL -ScVbaGlobals::Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Calculate() { return getApplication()->Calculate(); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) { return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Columns( const uno::Any& aIndex ) { return getApplication()->getActiveSheet()->Columns( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::CommandBars( const uno::Any& aIndex ) { uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW ); return xBase->CommandBars( aIndex ); } css::uno::Reference< ov::excel::XRange > SAL_CALL -ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) { return getApplication()->Union( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 ); } css::uno::Reference< ov::excel::XRange > SAL_CALL -ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) { return getApplication()->Intersect( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 ); } uno::Any SAL_CALL -ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Evaluate( const OUString& Name ) { return getApplication()->Evaluate( Name ); } css::uno::Any SAL_CALL -ScVbaGlobals::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) +ScVbaGlobals::WorksheetFunction( ) { return getApplication()->WorksheetFunction(); } uno::Any SAL_CALL -ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Windows( const uno::Any& aIndex ) { return getApplication()->Windows( aIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Rows( const uno::Any& aIndex ) { return getApplication()->getActiveSheet()->Rows( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getDebug() { try // return empty object on error { @@ -222,13 +222,13 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::MenuBars( const uno::Any& aIndex ) { return uno::Any( getApplication()->MenuBars(aIndex) ); } uno::Sequence< OUString > SAL_CALL -ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getAvailableServiceNames( ) { static bool bInit = false; static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 199868788e62..da401f40d5f2 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -38,8 +38,7 @@ class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication() - throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication(); public: ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, @@ -47,36 +46,36 @@ public: virtual ~ScVbaGlobals() override; // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override; + virtual void SAL_CALL Calculate( ) override; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; - virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) override; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() override; + virtual css::uno::Any SAL_CALL getDebug() override; + virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index d9451e31b7a7..6b338e478106 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -34,7 +34,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, - const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException, uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& rxContext ) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), mxCell( getXSomethingFromArgs< table::XCell >( rArgs, 1, false ) ), mnType( office::MsoHyperlinkType::msoHyperlinkRange ) @@ -47,7 +47,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnchor, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Any& rAddress, const uno::Any& rSubAddress, - const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException) : + const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) : HyperlinkImpl_BASE( rxAnchor, rxContext ) // parent of Hyperlink is the anchor object { // extract parameters, Address must not be empty @@ -105,52 +105,52 @@ ScVbaHyperlink::~ScVbaHyperlink() { } -OUString ScVbaHyperlink::getName() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getName() { // it seems this attribute is same as TextToDisplay return getTextToDisplay(); } -void ScVbaHyperlink::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setName( const OUString& rName ) { setTextToDisplay( rName ); } -OUString ScVbaHyperlink::getAddress() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getAddress() { return getUrlComponents().first; } -void ScVbaHyperlink::setAddress( const OUString& rAddress ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setAddress( const OUString& rAddress ) { UrlComponents aUrlComp = getUrlComponents(); aUrlComp.first = rAddress; setUrlComponents( aUrlComp ); } -OUString ScVbaHyperlink::getSubAddress() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getSubAddress() { return getUrlComponents().second; } -void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress ) { UrlComponents aUrlComp = getUrlComponents(); aUrlComp.second = rSubAddress; setUrlComponents( aUrlComp ); } -OUString SAL_CALL ScVbaHyperlink::getScreenTip() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaHyperlink::getScreenTip() { return maScreenTip; } -void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip ) { maScreenTip = rScreenTip; } -OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getTextToDisplay() { ensureTextField(); OUString aTextToDisplay; @@ -158,18 +158,18 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::e return aTextToDisplay; } -void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) { ensureTextField(); mxTextField->setPropertyValue("Representation", uno::Any( rTextToDisplay ) ); } -sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaHyperlink::getType() { return mnType; } -uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() { if( mnType == office::MsoHyperlinkType::msoHyperlinkRange ) { @@ -188,7 +188,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno:: throw uno::RuntimeException(); } -uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape() throw (uno::RuntimeException, std::exception) +uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape() { // error if called at a range Hyperlink object return uno::Reference< msforms::XShape >( getParent(), uno::UNO_QUERY_THROW ); @@ -198,13 +198,13 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlink, "ooo.vba.excel.Hyperlink" ) // private -------------------------------------------------------------------- -void ScVbaHyperlink::ensureTextField() throw (uno::RuntimeException) +void ScVbaHyperlink::ensureTextField() { if( !mxTextField.is() ) throw uno::RuntimeException(); } -ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::RuntimeException) +ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() { ensureTextField(); OUString aUrl; @@ -215,7 +215,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run return UrlComponents( aUrl.copy( 0, nHashPos ), aUrl.copy( nHashPos + 1 ) ); } -void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (uno::RuntimeException) +void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) { ensureTextField(); OUStringBuffer aUrl( rUrlComp.first ); diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 899721280105..3e941a748541 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -36,31 +36,31 @@ public: /// @throws css::uno::RuntimeException ScVbaHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /// @throws css::uno::RuntimeException ScVbaHyperlink( const css::uno::Reference< ov::XHelperInterface >& rxAnchor, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress, - const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) throw (css::uno::RuntimeException); + const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ); virtual ~ScVbaHyperlink() override; // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual OUString SAL_CALL getAddress() override; + virtual void SAL_CALL setAddress( const OUString& rAddress ) override; + virtual OUString SAL_CALL getSubAddress() override; + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) override; + virtual OUString SAL_CALL getScreenTip() override; + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) override; + virtual OUString SAL_CALL getTextToDisplay() override; + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) override; + virtual sal_Int32 SAL_CALL getType() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() override; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE @@ -69,11 +69,11 @@ private: typedef ::std::pair< OUString, OUString > UrlComponents; /// @throws css::uno::RuntimeException - void ensureTextField() throw (css::uno::RuntimeException); + void ensureTextField(); /// @throws css::uno::RuntimeException - UrlComponents getUrlComponents() throw (css::uno::RuntimeException); + UrlComponents getUrlComponents(); /// @throws css::uno::RuntimeException - void setUrlComponents( const UrlComponents& rUrlComp ) throw (css::uno::RuntimeException); + void setUrlComponents( const UrlComponents& rUrlComp ); private: css::uno::Reference< css::table::XCell > mxCell; diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 3e8f2260f209..0d3a2c608432 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -35,7 +35,7 @@ namespace { @throws css::uno::RuntimeException */ -bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner ) throw (uno::RuntimeException) +bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner ) { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) @@ -54,12 +54,12 @@ struct EqualAnchorFunctor uno::Reference< msforms::XShape > mxAnchorShape; sal_Int32 mnType; /// @throws uno::RuntimeException - explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); + explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ); /// @throws uno::RuntimeException - bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException); + bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const; }; -EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException) : +EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) : mnType( rxHlink->getType() ) { switch( mnType ) @@ -76,7 +76,7 @@ EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink } } -bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException) +bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const { sal_Int32 nType = rxHlink->getType(); if( nType != mnType ) @@ -110,37 +110,37 @@ class ScVbaHlinkContainer : public ::cppu::WeakImplHelper< container::XIndexAcce { public: /// @throws uno::RuntimeException - explicit ScVbaHlinkContainer() throw (uno::RuntimeException); + explicit ScVbaHlinkContainer(); /// @throws uno::RuntimeException - explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges ) throw (uno::RuntimeException); + explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges ); /** Inserts the passed hyperlink into the collection. Will remove a Hyperlink object with the same anchor as the passed Hyperlink object. @throws uno::RuntimeException */ - void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); + void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; private: typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector; HyperlinkVector maHlinks; }; -ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) +ScVbaHlinkContainer::ScVbaHlinkContainer() { // TODO FIXME: fill with existing hyperlinks } ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, - const ScRangeList& rScRanges ) throw (uno::RuntimeException) + const ScRangeList& rScRanges ) { for( sal_Int32 nIndex = 0, nCount = rxSheetContainer->getCount(); nIndex < nCount; ++nIndex ) { @@ -151,7 +151,7 @@ ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetC } } -void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException) +void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) { HyperlinkVector::iterator aIt = ::std::find_if( maHlinks.begin(), maHlinks.end(), EqualAnchorFunctor( rxHlink ) ); if( aIt == maHlinks.end() ) @@ -160,25 +160,24 @@ void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperli *aIt = rxHlink; } -sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount() { return static_cast< sal_Int32 >( maHlinks.size() ); } uno::Any SAL_CALL ScVbaHlinkContainer::getByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( (0 <= nIndex) && (nIndex < getCount()) ) return uno::Any( maHlinks[ static_cast< size_t >( nIndex ) ] ); throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() { return cppu::UnoType<excel::XHyperlink>::get(); } -sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() { return !maHlinks.empty(); } @@ -195,7 +194,7 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, - const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& rxContext ) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ), ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ) { @@ -203,7 +202,7 @@ ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxPa ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, - const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (uno::RuntimeException) : + const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ), ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ), mxSheetHlinks( rxSheetHlinks ) @@ -218,7 +217,7 @@ ScVbaHyperlinks::~ScVbaHyperlinks() uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add( const uno::Any& rAnchor, const uno::Any& rAddress, const uno::Any& rSubAddress, - const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException, std::exception) + const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) { /* If this Hyperlinks object has been created from a Range object, the call to Add() is passed to the Hyperlinks object of the parent @@ -243,7 +242,7 @@ uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add( return xHlink; } -void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaHyperlinks::Delete() { // FIXME not implemented throw uno::RuntimeException(); @@ -251,14 +250,14 @@ void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::excep // XEnumerationAccess --------------------------------------------------------- -uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration() throw (uno::RuntimeException) +uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration() { return new SimpleIndexAccessToEnumeration( m_xIndexAccess ); } // XElementAccess ------------------------------------------------------------- -uno::Type SAL_CALL ScVbaHyperlinks::getElementType() throw (uno::RuntimeException) +uno::Type SAL_CALL ScVbaHyperlinks::getElementType() { return cppu::UnoType<excel::XHyperlink>::get(); } diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 81b49a6e10c3..48aa35b4b19b 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -101,29 +101,28 @@ public: /// @throws css::uno::RuntimeException explicit ScVbaHyperlinks( const css::uno::Reference< ov::XHelperInterface >& rxParent, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /// @throws css::uno::RuntimeException explicit ScVbaHyperlinks( const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (css::uno::RuntimeException); + const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ); virtual ~ScVbaHyperlinks() override; // XHyperlinks virtual css::uno::Reference< ov::excel::XHyperlink > SAL_CALL Add( const css::uno::Any& rAnchor, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress, - const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) override; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 2b1a7d114e39..51b4c2270615 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -79,7 +79,7 @@ static PatternMap lcl_getPatternMap() static PatternMap aPatternMap( lcl_getPatternMap() ); -ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) throw ( lang::IllegalArgumentException) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc ) +ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc ) { // auto color m_aPattColor.SetColor( (sal_uInt32)0x0 ); @@ -89,14 +89,14 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, } uno::Any -ScVbaInterior::getColor() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getColor() { Color aBackColor( GetBackColor() ); return uno::makeAny( OORGBToXLRGB( aBackColor.GetColor() ) ); } void -ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setColor( const uno::Any& _color ) { sal_Int32 nColor = 0; if( _color >>= nColor ) @@ -147,7 +147,7 @@ ScVbaInterior::getPalette() } void SAL_CALL -ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) +ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -198,7 +198,7 @@ ScVbaInterior::GetColorIndex( const sal_Int32 nColor ) } uno::Any SAL_CALL -ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException, std::exception ) +ScVbaInterior::getColorIndex() { sal_Int32 nColor = 0; // hackly for excel::XlColorIndex::xlColorIndexNone @@ -293,7 +293,7 @@ ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& } // OOo do not support below API uno::Any SAL_CALL -ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPattern() { // XlPattern uno::Any aPattern = GetUserDefinedAttributes( PATTERN ); @@ -302,7 +302,7 @@ ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception) return uno::makeAny( excel::XlPattern::xlPatternNone ); } void SAL_CALL -ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPattern( const uno::Any& _pattern ) { if( _pattern >>= m_nPattern ) { @@ -337,7 +337,7 @@ ScVbaInterior::GetBackColor() return aBackColor; } uno::Any SAL_CALL -ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPatternColor() { // 0 is the default color. no filled. uno::Any aPatternColor = GetUserDefinedAttributes( PATTERNCOLOR ); @@ -349,7 +349,7 @@ ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception) return uno::makeAny( sal_Int32( 0 ) ); } void SAL_CALL -ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) { sal_Int32 nPattColor = 0; if( _patterncolor >>= nPattColor ) @@ -361,7 +361,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt throw uno::RuntimeException("Invalid Pattern Color" ); } uno::Any SAL_CALL -ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPatternColorIndex() { sal_Int32 nColor = 0; XLRGBToOORGB( getPatternColor() ) >>= nColor; @@ -369,7 +369,7 @@ ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::excepti return GetIndexColor( nColor ); } void SAL_CALL -ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) { sal_Int32 nColorIndex = 0; if( _patterncolorindex >>= nColorIndex ) diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 65abdbf1a7b3..98d928686f66 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -58,19 +58,19 @@ protected: public: /// @throws css::lang::IllegalArgumentException ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr) throw ( css::lang::IllegalArgumentException); + const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr); - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getColor() override ; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) override ; - virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getPattern() override; + virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) override; + virtual css::uno::Any SAL_CALL getPatternColor() override; + virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) override; + virtual css::uno::Any SAL_CALL getPatternColorIndex() override; + virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) override; //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index f0088b8af289..0e023ac17e0a 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -13,30 +13,30 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) +ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) { } OUString SAL_CALL -ScVbaMenu::getCaption() throw ( uno::RuntimeException, std::exception ) +ScVbaMenu::getCaption() { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaMenu::setCaption( const OUString& _caption ) { m_xCommandBarControl->setCaption( _caption ); } void SAL_CALL -ScVbaMenu::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenu::Delete( ) { m_xCommandBarControl->Delete(); } uno::Any SAL_CALL -ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenu::MenuItems( const uno::Any& aIndex ) { uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBarControl->Controls( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuItems > xMenuItems( new ScVbaMenuItems( this, mxContext, xCommandBarControls ) ); diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 7cc42f0336b2..a6e0e23979db 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -22,13 +22,13 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException ); + ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index e400ab3a31e9..2c7c04b1597a 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -13,12 +13,12 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) throw( uno::RuntimeException ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar) +ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar) { } uno::Any SAL_CALL -ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenuBar::Menus( const uno::Any& aIndex ) { uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBar->Controls( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenus > xMenus( new ScVbaMenus( this, mxContext, xCommandBarControls ) ); diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index 03ebf37b212b..5a07657f3a9a 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -22,9 +22,9 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar ) throw( css::uno::RuntimeException ); + ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar ); - virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 93a63ec6350c..1c2759990c66 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -21,14 +21,14 @@ class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menubar if( hasMoreElements() ) @@ -42,7 +42,7 @@ public: } }; -ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) +ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) { } @@ -52,13 +52,13 @@ ScVbaMenuBars::~ScVbaMenuBars() // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenuBars::getElementType() throw ( uno::RuntimeException ) +ScVbaMenuBars::getElementType() { return cppu::UnoType<excel::XMenuBar>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenuBars::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -72,14 +72,14 @@ ScVbaMenuBars::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenuBars::getCount() throw(css::uno::RuntimeException) +ScVbaMenuBars::getCount() { return m_xCommandBars->getCount(); } // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { sal_Int16 nIndex = 0; aIndex >>= nIndex; diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index 17ac680815a5..da2017c40baf 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -25,16 +25,16 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ) throw (css::uno::RuntimeException); + ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ); virtual ~ScVbaMenuBars() override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 48321652ca3f..1ef5836cfe91 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -11,36 +11,36 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) +ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) { } OUString SAL_CALL -ScVbaMenuItem::getCaption() throw ( uno::RuntimeException, std::exception ) +ScVbaMenuItem::getCaption() { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaMenuItem::setCaption( const OUString& _caption ) { m_xCommandBarControl->setCaption( _caption ); } OUString SAL_CALL -ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException, std::exception ) +ScVbaMenuItem::getOnAction() { return m_xCommandBarControl->getOnAction(); } void SAL_CALL -ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException, std::exception) +ScVbaMenuItem::setOnAction( const OUString& _onaction ) { m_xCommandBarControl->setOnAction( _onaction ); } void SAL_CALL -ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenuItem::Delete( ) { m_xCommandBarControl->Delete(); } diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 5fc1bbc38c78..86d22c34bde6 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -22,14 +22,14 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException ); + ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; + virtual OUString SAL_CALL getOnAction() override; + virtual void SAL_CALL setOnAction( const OUString& _onaction ) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index d5fd6484ecf3..76fb396352c9 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -24,14 +24,14 @@ class MenuEnumeration : public MenuEnumeration_BASE uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menu if( hasMoreElements() ) @@ -55,19 +55,19 @@ public: } }; -ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) +ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) { } // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenuItems::getElementType() throw ( uno::RuntimeException ) +ScVbaMenuItems::getElementType() { return cppu::UnoType<excel::XMenuItem>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenuItems::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -81,7 +81,7 @@ ScVbaMenuItems::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenuItems::getCount() throw(css::uno::RuntimeException) +ScVbaMenuItems::getCount() { // FIXME: should check if it is a popup menu return m_xCommandBarControls->getCount(); @@ -89,7 +89,7 @@ ScVbaMenuItems::getCount() throw(css::uno::RuntimeException) // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW ); if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup ) @@ -99,7 +99,7 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro throw uno::RuntimeException(); } -uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) { sal_Int32 nType = office::MsoControlType::msoControlButton; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 21a19cc98ddf..506e3a9b2b3e 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -24,17 +24,17 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); + ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override; + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index 8247faf5898d..be32c02008d0 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -23,14 +23,14 @@ class MenuEnumeration : public MenuEnumeration_BASE uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menu if( hasMoreElements() ) @@ -49,19 +49,19 @@ public: } }; -ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) +ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) { } // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenus::getElementType() throw ( uno::RuntimeException ) +ScVbaMenus::getElementType() { return cppu::UnoType<excel::XMenu>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenus::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenus::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -75,7 +75,7 @@ ScVbaMenus::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenus::getCount() throw(css::uno::RuntimeException) +ScVbaMenus::getCount() { // FIXME: should check if it is a popup menu return m_xCommandBarControls->getCount(); @@ -83,7 +83,7 @@ ScVbaMenus::getCount() throw(css::uno::RuntimeException) // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW ); if( xCommandBarControl->getType() != office::MsoControlType::msoControlPopup ) @@ -91,7 +91,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) ); } -uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) { sal_Int32 nType = office::MsoControlType::msoControlPopup; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index dff934db42d2..3727d7500564 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -24,17 +24,17 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); + ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override; + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 7fe9a92a5f72..6e6e86e9ac4b 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -56,37 +56,37 @@ ScVbaName::~ScVbaName() } OUString -ScVbaName::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getName() { return mxNamedRange->getName(); } void -ScVbaName::setName( const OUString & rName ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setName( const OUString & rName ) { mxNamedRange->setName( rName ); } OUString -ScVbaName::getNameLocal() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getNameLocal() { return getName(); } void -ScVbaName::setNameLocal( const OUString & rName ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setNameLocal( const OUString & rName ) { setName( rName ); } sal_Bool -ScVbaName::getVisible() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getVisible() { return true; } void -ScVbaName::setVisible( sal_Bool /*bVisible*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setVisible( sal_Bool /*bVisible*/ ) { } @@ -131,7 +131,7 @@ void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra } OUString -ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getValue() { rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); @@ -139,62 +139,62 @@ ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::setValue( const OUString & rValue ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setValue( const OUString & rValue ) { setContent( rValue, formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } OUString -ScVbaName::getRefersTo() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersTo() { return getValue(); } void -ScVbaName::setRefersTo( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersTo( const OUString & rRefersTo ) { setValue( rRefersTo ); } OUString -ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToLocal() { return getRefersTo(); } void -ScVbaName::setRefersToLocal( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToLocal( const OUString & rRefersTo ) { setRefersTo( rRefersTo ); } OUString -ScVbaName::getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToR1C1() { rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); return sResult; } void -ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) { setContent( rRefersTo, formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } OUString -ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToR1C1Local() { return getRefersToR1C1(); } void -ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) { setRefersTo( rRefersTo ); } css::uno::Reference< ov::excel::XRange > -ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToRange() { uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 ); @@ -202,7 +202,7 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception) +ScVbaName::Delete() { mxNames->removeByName( mxNamedRange->getName() ); } diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index c2b049948e8b..300b836612b6 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -41,26 +41,26 @@ public: virtual ~ScVbaName() override; // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString &rName ) override; + virtual OUString SAL_CALL getNameLocal() override; + virtual void SAL_CALL setNameLocal( const OUString &rName ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; + virtual OUString SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const OUString &rValue ) override; + virtual OUString SAL_CALL getRefersTo() override; + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToLocal() override; + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToR1C1() override; + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToR1C1Local() override; + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() override; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 7042651bbb88..f9f1e32b0472 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -44,9 +44,9 @@ class NamesEnumeration : public EnumerationHelperImpl uno::Reference< sheet::XNamedRanges > m_xNames; public: /// @throws uno::RuntimeException - NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} + NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< sheet::XNamedRange > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( m_xParent, m_xContext, xNamed ,m_xNames , m_xModel ) ) ); @@ -92,7 +92,6 @@ ScVbaNames::Add( const css::uno::Any& Name , const css::uno::Any& /*CategoryLocal*/, const css::uno::Any& RefersToR1C1, const css::uno::Any& RefersToR1C1Local ) - throw (css::uno::RuntimeException, std::exception) { OUString sName; uno::Reference< excel::XRange > xRange; @@ -227,13 +226,13 @@ ScVbaNames::Add( const css::uno::Any& Name , // XEnumerationAccess css::uno::Type -ScVbaNames::getElementType() throw( css::uno::RuntimeException ) +ScVbaNames::getElementType() { return cppu::UnoType<ov::excel::XName>::get(); } uno::Reference< container::XEnumeration > -ScVbaNames::createEnumeration() throw (uno::RuntimeException) +ScVbaNames::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW ); return new NamesEnumeration( getParent(), mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames ); diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index 912171f9ee21..bf8be0ca29e5 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -46,8 +46,8 @@ public: virtual ~ScVbaNames() override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , @@ -60,9 +60,7 @@ public: const css::uno::Any& aRefersToLocal, const css::uno::Any& aCategoryLocal, const css::uno::Any& aRefersToR1C1, - const css::uno::Any& aRefersToR1C1Local ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aRefersToR1C1Local ) override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index b47a127417e8..9030b8ad661b 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -48,90 +48,90 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen } uno::Reference< uno::XInterface > SAL_CALL -ScVbaOLEObject::getObject() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getObject() { return uno::Reference< uno::XInterface >( m_xControl, uno::UNO_QUERY_THROW ); } sal_Bool SAL_CALL -ScVbaOLEObject::getEnabled() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getEnabled() { return m_xControl->getEnabled(); } void SAL_CALL -ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setEnabled( sal_Bool _enabled ) { m_xControl->setEnabled( _enabled ); } sal_Bool SAL_CALL -ScVbaOLEObject::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getVisible() { return m_xControl->getVisible(); } void SAL_CALL -ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setVisible( sal_Bool _visible ) { m_xControl->setVisible( _visible ); } double SAL_CALL -ScVbaOLEObject::getLeft() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getLeft() { return m_xControl->getLeft(); } void SAL_CALL -ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setLeft( double _left ) { m_xControl->setLeft( _left ); } double SAL_CALL -ScVbaOLEObject::getTop() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getTop() { return m_xControl->getTop(); } void SAL_CALL -ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setTop( double _top ) { m_xControl->setTop( _top ); } double SAL_CALL -ScVbaOLEObject::getHeight() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getHeight() { return m_xControl->getHeight(); } void SAL_CALL -ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setHeight( double _height ) { m_xControl->setHeight( _height ); } double SAL_CALL -ScVbaOLEObject::getWidth() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getWidth() { return m_xControl->getWidth(); } void SAL_CALL -ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setWidth( double _width ) { m_xControl->setWidth( _width ); } -OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaOLEObject::getLinkedCell() { return m_xControl->getControlSource(); } -void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) { m_xControl->setControlSource( _linkedcell ); } diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index e9285496035e..f3dc86c8f1c8 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -38,22 +38,22 @@ public: css::uno::Reference< css::drawing::XControlShape > const & xControlShape ); // XOLEObject Attributes - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() override; + virtual sal_Bool SAL_CALL getEnabled() override; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( double _left ) override; + virtual double SAL_CALL getTop() override; + virtual void SAL_CALL setTop( double _top ) override; + virtual double SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( double _height ) override; + virtual double SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( double _width ) override; + virtual OUString SAL_CALL getLinkedCell() override; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 5ea0dfe40443..6b700cc33f6f 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -49,12 +49,12 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return vObjects.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -62,12 +62,12 @@ public: } // Methods XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<drawing::XControlShape>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return ( getCount() > 0 ); } @@ -84,12 +84,12 @@ class EnumWrapper : public EnumerationHelper_BASE public: EnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) { @@ -113,7 +113,7 @@ ScVbaOLEObjects::ScVbaOLEObjects( const uno::Reference< XHelperInterface >& xPar { } uno::Reference< container::XEnumeration > -ScVbaOLEObjects::createEnumeration() throw (uno::RuntimeException) +ScVbaOLEObjects::createEnumeration() { return new EnumWrapper( getParent(), mxContext, m_xIndexAccess ); } @@ -131,7 +131,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource ) } uno::Any -ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) +ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) { try { @@ -158,7 +158,7 @@ ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::Runt } uno::Type -ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) +ScVbaOLEObjects::getElementType() { return cppu::UnoType<ooo::vba::excel::XOLEObject>::get(); } diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index ef992d2c5857..3ffc0a31621b 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -29,7 +29,7 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; public: @@ -37,8 +37,8 @@ public: const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 23553b25f054..67c521e9be73 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -21,7 +21,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; void -ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException, std::exception) +ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) { if (mxOutline.is()) { diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index ae1991e60007..fa38211daaa2 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -34,7 +34,7 @@ public: css::uno::Reference<css::sheet::XSheetOutline> const & outline): ScVbaOutline_BASE( xParent, xContext) , mxOutline(outline) {} - virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) override ; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 2f29060bb1a2..53a63c01e29a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -27,7 +27,7 @@ template< typename... Ifc > ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< beans::XPropertySet >& xProps, - sheet::TablePageBreakData aTablePageBreakData) throw (uno::RuntimeException): + sheet::TablePageBreakData aTablePageBreakData): ScVbaPageBreak_BASE( xParent, xContext ), mxRowColPropertySet( xProps ), maTablePageBreakData( aTablePageBreakData ) @@ -35,7 +35,7 @@ ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface } template< typename... Ifc > -sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException) +sal_Int32 ScVbaPageBreak< Ifc... >::getType() { uno::Any aValue = mxRowColPropertySet->getPropertyValue("IsStartOfNewPage"); bool hasPageBreak = false; @@ -51,7 +51,7 @@ sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException) } template< typename... Ifc > -void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeException) +void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) { if( (type != excel::XlPageBreak::xlPageBreakNone) && (type != excel::XlPageBreak::xlPageBreakManual) && @@ -74,13 +74,13 @@ void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeExcept } template< typename... Ifc > -void ScVbaPageBreak< Ifc... >::Delete() throw ( script::BasicErrorException, uno::RuntimeException) +void ScVbaPageBreak< Ifc... >::Delete() { mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(false)); } template< typename... Ifc > -uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location() throw ( script::BasicErrorException, uno::RuntimeException) +uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location() { uno::Reference< table::XCellRange > xRange( mxRowColPropertySet, uno::UNO_QUERY_THROW ); return new ScVbaRange( ScVbaPageBreak_BASE::getParent(), ScVbaPageBreak_BASE::mxContext, xRange); @@ -113,7 +113,7 @@ template class ScVbaPageBreak< excel::XVPageBreak >; ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException ) + css::sheet::TablePageBreakData aTablePageBreakData ) : ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData ) { } diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 9b26b34e7da5..e86c799b050d 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -41,13 +41,13 @@ public: ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); + css::sheet::TablePageBreakData aTablePageBreakData); - virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType( ) SAL_OVERRIDE; + virtual void SAL_CALL setType(sal_Int32 type) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL Delete() SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() SAL_OVERRIDE; }; typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; @@ -59,7 +59,7 @@ public: ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException): + css::sheet::TablePageBreakData aTablePageBreakData): ScVbaHPageBreak_BASE( xParent,xContext,xProps,aTablePageBreakData ){} // XHelperInterface @@ -77,7 +77,7 @@ public: ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); + css::sheet::TablePageBreakData aTablePageBreakData); virtual ~ScVbaVPageBreak() override; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index eccd1809c911..b5d964a7a206 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -41,7 +41,7 @@ public: } /// @throws css::uno::RuntimeException - sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange ) throw (css::uno::RuntimeException) + sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange ) { if( m_bColumn ) return xRange->getColumn() - 1; @@ -49,7 +49,7 @@ public: } /// @throws uno::RuntimeException - sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart ) throw (uno::RuntimeException) + sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart ) { if( m_bColumn ) return nUsedStart + xRange->Columns( uno::Any() )->getCount() - 1; @@ -57,7 +57,7 @@ public: } /// @throws uno::RuntimeException - uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks() throw (uno::RuntimeException) + uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks() { if( m_bColumn ) return mxSheetPageBreak->getColumnPageBreaks(); @@ -65,7 +65,7 @@ public: } /// @throws uno::RuntimeException - uno::Reference<container::XIndexAccess> getRowColContainer() throw (uno::RuntimeException) + uno::Reference<container::XIndexAccess> getRowColContainer() { uno::Reference< table::XColumnRowRange > xColumnRowRange( mxSheetPageBreak, uno::UNO_QUERY_THROW ); uno::Reference<container::XIndexAccess> xIndexAccess; @@ -77,21 +77,21 @@ public: } /// @throws uno::RuntimeException - sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException); + sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); + uno::Any Add( const css::uno::Any& Before ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; + virtual uno::Type SAL_CALL getElementType( ) override { if( m_bColumn ) return cppu::UnoType<excel::XVPageBreak>::get(); return cppu::UnoType<excel::XHPageBreak>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -102,7 +102,7 @@ public: * also considers the position and sizes of shapes and manually inserted page breaks * Note: In MS there is a limit of 1026 horizontal page breaks per sheet. */ -sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL RangePageBreaks::getCount( ) { sal_Int32 nCount = 0; uno::Reference< excel::XWorksheet > xWorksheet( mxParent, uno::UNO_QUERY_THROW ); @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException, s return nCount; } -uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) { if( (Index < getCount()) && ( Index >= 0 )) { @@ -141,7 +141,7 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::In throw lang::IndexOutOfBoundsException(); } -sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException) +sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) { sal_Int32 index = -1; sheet::TablePageBreakData aTablePageBreakData; @@ -166,7 +166,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI return aTablePageBreakData; } -uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) +uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) { uno::Reference< excel::XRange > xRange; Before >>= xRange; @@ -193,12 +193,12 @@ class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit RangePageBreaksEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -208,12 +208,12 @@ public: ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, - uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak) throw (uno::RuntimeException): + uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak): ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, false )) { } -uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script::BasicErrorException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) { RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() ); if( pPageBreaks ) @@ -224,7 +224,7 @@ uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script: } uno::Reference< container::XEnumeration > -ScVbaHPageBreaks::createEnumeration() throw (uno::RuntimeException) +ScVbaHPageBreaks::createEnumeration() { return new RangePageBreaksEnumWrapper( m_xIndexAccess ); } @@ -236,7 +236,7 @@ ScVbaHPageBreaks::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) +ScVbaHPageBreaks::getElementType() { return cppu::UnoType<excel::XHPageBreak>::get(); } @@ -262,7 +262,7 @@ ScVbaHPageBreaks::getServiceNames() //VPageBreak ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, - uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException ) + uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) : ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, true ) ) { } @@ -272,7 +272,7 @@ ScVbaVPageBreaks::~ScVbaVPageBreaks() } uno::Any SAL_CALL -ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception ) +ScVbaVPageBreaks::Add( const uno::Any& Before ) { RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() ); if( pPageBreaks ) @@ -283,7 +283,7 @@ ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorExcept } uno::Reference< container::XEnumeration > -ScVbaVPageBreaks::createEnumeration() throw ( uno::RuntimeException ) +ScVbaVPageBreaks::createEnumeration() { return new RangePageBreaksEnumWrapper( m_xIndexAccess ); } @@ -295,7 +295,7 @@ ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) +ScVbaVPageBreaks::getElementType() { return cppu::UnoType<excel::XVPageBreak>::get(); } diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 762e6e7c8af9..cf656d074128 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -42,14 +42,14 @@ public: /// @throws css::uno::RuntimeException ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak) throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak); // XHPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface @@ -66,16 +66,16 @@ public: /// @throws css::uno::RuntimeException ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException ); + css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ); virtual ~ScVbaVPageBreaks() override; // XVPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject( const css::uno::Any& ) override; // XHelperInterface diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index d39af7984864..64179f85f658 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -45,7 +45,7 @@ using namespace ::ooo::vba; ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheet >& xSheet, - const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException): + const uno::Reference< frame::XModel >& xModel): ScVbaPageSetup_BASE( xParent, xContext ), mxSheet( xSheet ), mbIsLandscape( false ) { // query for current page style @@ -64,7 +64,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent mxPageProps->getPropertyValue("IsLandscape") >>= mbIsLandscape; } -OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintArea() { OUString aPrintArea; uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); @@ -87,7 +87,7 @@ OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeExcepti return aPrintArea; } -void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) { uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); if( rAreas.isEmpty() || @@ -116,32 +116,32 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css: } } -double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException) +double SAL_CALL ScVbaPageSetup::getHeaderMargin() { return VbaPageSetupBase::getHeaderMargin(); } -void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) { VbaPageSetupBase::setHeaderMargin( margin ); } -double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException) +double SAL_CALL ScVbaPageSetup::getFooterMargin() { return VbaPageSetupBase::getFooterMargin(); } -void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) { VbaPageSetupBase::setFooterMargin( margin ); } -uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() { return mxPageProps->getPropertyValue("ScaleToPagesY"); } -void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) { sal_uInt16 scaleToPageY = 0; try @@ -159,12 +159,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) } } -uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() { return mxPageProps->getPropertyValue("ScaleToPagesX"); } -void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) { sal_uInt16 scaleToPageX = 0; try @@ -182,12 +182,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) } } -uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getZoom() { return mxPageProps->getPropertyValue("PageScale"); } -void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) { sal_uInt16 pageScale = 0; try @@ -230,7 +230,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru mxPageProps->setPropertyValue("PageScale", uno::makeAny( pageScale )); } -OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getLeftHeader() { OUString leftHeader; try @@ -249,7 +249,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeExcept return leftHeader; } -void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) { try { @@ -266,7 +266,7 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw ( } } -OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getCenterHeader() { OUString centerHeader; try @@ -285,7 +285,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeExce return centerHeader; } -void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) { try { @@ -302,7 +302,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) thr } } -OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getRightHeader() { OUString rightHeader; try @@ -321,7 +321,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeExcep return rightHeader; } -void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) { try { @@ -338,7 +338,7 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw } } -OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getLeftFooter() { OUString leftFooter; try @@ -357,7 +357,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeExcept return leftFooter; } -void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) { try { @@ -374,7 +374,7 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw ( } } -OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getCenterFooter() { OUString centerFooter; try @@ -393,7 +393,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeExce return centerFooter; } -void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) { try { @@ -411,7 +411,7 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) thr } -OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getRightFooter() { OUString rightFooter; try @@ -430,7 +430,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeExcep return rightFooter; } -void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) { try { @@ -447,7 +447,7 @@ void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw } } -sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() { sal_Int32 order = excel::XlOrder::xlDownThenOver; try @@ -465,7 +465,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException, return order; } -void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) { bool bOrder = true; switch( order ) @@ -488,7 +488,7 @@ void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::Runtime } } -sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() { sal_Int16 number = 0; try @@ -508,7 +508,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime return number; } -void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) { if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; @@ -524,7 +524,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr } } -sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() { bool centerVertically = false; try @@ -538,7 +538,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime return centerVertically; } -void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) { try { @@ -549,7 +549,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th } } -sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() { bool centerHorizontally = false; try @@ -563,7 +563,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti return centerHorizontally; } -void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally) { try { @@ -574,7 +574,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally } } -sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() { bool printHeadings = false; try @@ -588,7 +588,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc return printHeadings; } -void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) { try { @@ -599,32 +599,32 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c } } -sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() { return false; } -void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ ) { } -OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() { return OUString(); } -void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) { } -OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() { return OUString(); } -void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) { } -sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() { awt::Size aSize; // current papersize mxPageProps->getPropertyValue( "Size" ) >>= aSize; @@ -637,7 +637,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException, return nPaperSizeIndex; } -void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize ) { if ( papersize != excel::XlPaperSize::xlPaperUser ) { diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index f0b84bc3eabd..e1c6c4cfc50b 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -39,52 +39,52 @@ public: ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet, - const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XModel >& xModel); // Attribute - virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException) override; - void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException) override; - double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException) override; - void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPrintArea() override; + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) override; + virtual double SAL_CALL getHeaderMargin() override; + void SAL_CALL setHeaderMargin( double margin ) override; + double SAL_CALL getFooterMargin() override; + void SAL_CALL setFooterMargin( double margin ) override; + virtual css::uno::Any SAL_CALL getFitToPagesTall() override; + virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) override; + virtual css::uno::Any SAL_CALL getFitToPagesWide() override; + virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) override; + virtual css::uno::Any SAL_CALL getZoom() override; + virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) override; + virtual OUString SAL_CALL getLeftHeader() override; + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) override; + virtual OUString SAL_CALL getCenterHeader() override; + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) override; + virtual OUString SAL_CALL getRightHeader() override; + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) override; + virtual OUString SAL_CALL getLeftFooter() override; + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) override; + virtual OUString SAL_CALL getCenterFooter() override; + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) override; + virtual OUString SAL_CALL getRightFooter() override; + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) override; + virtual sal_Int32 SAL_CALL getOrder() override; + virtual void SAL_CALL setOrder( sal_Int32 order ) override; + virtual sal_Int32 SAL_CALL getFirstPageNumber() override; + virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) override; + virtual sal_Bool SAL_CALL getCenterVertically() override; + virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) override; + virtual sal_Bool SAL_CALL getCenterHorizontally() override; + virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) override; + virtual sal_Bool SAL_CALL getPrintHeadings() override; + virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) override; - virtual sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintGridlines() override; + virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) override; + virtual ::rtl::OUString SAL_CALL getPrintTitleRows() override; + virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) override; + virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() override; + virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) override; + virtual sal_Int32 SAL_CALL getPaperSize() override; + virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index e6b577f2f3d5..7454b6f01792 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -54,12 +54,12 @@ public: DefaultPalette(){} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return SAL_N_ELEMENTS(spnDefColorTable8); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -67,11 +67,11 @@ public: } // Methods XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return ::cppu::UnoType<sal_Int32>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return true; } diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 1b8e905e489a..5abb35c853be 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -30,7 +30,7 @@ ScVbaPane::ScVbaPane( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& rModel, - const uno::Reference< sheet::XViewPane >& rViewPane ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XViewPane >& rViewPane ) : m_xModel(rModel, uno::UNO_SET_THROW), m_xViewPane(rViewPane, uno::UNO_SET_THROW), m_xParent(xParent), @@ -39,13 +39,13 @@ ScVbaPane::ScVbaPane( } sal_Int32 SAL_CALL -ScVbaPane::getScrollColumn() throw (uno::RuntimeException, std::exception) +ScVbaPane::getScrollColumn() { return ( m_xViewPane->getFirstVisibleColumn() + 1 ); } void SAL_CALL -ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) { if( _scrollcolumn < 1 ) { @@ -55,13 +55,13 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti } sal_Int32 SAL_CALL -ScVbaPane::getScrollRow() throw (uno::RuntimeException, std::exception) +ScVbaPane::getScrollRow() { return ( m_xViewPane->getFirstVisibleRow() + 1 ); } void SAL_CALL -ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, std::exception) +ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) { if( _scrollrow < 1 ) { @@ -71,7 +71,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, st } uno::Reference< excel::XRange > SAL_CALL -ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception) +ScVbaPane::getVisibleRange() { // TODO: Excel includes partly visible rows/columns, Calc does not table::CellRangeAddress aRangeAddr = m_xViewPane->getVisibleRange(); @@ -85,7 +85,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception) //Method void SAL_CALL -ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { OUString messageBuffer; sal_Int32 downRows = 0; @@ -138,7 +138,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any } void SAL_CALL -ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { OUString messageBuffer; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 831aca519f6a..5c3589223219 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -33,18 +33,18 @@ public: const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, - const css::uno::Reference< css::sheet::XViewPane >& rViewPane ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::sheet::XViewPane >& rViewPane ); // XPane attributes - virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScrollColumn() override; + virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) override; + virtual sal_Int32 SAL_CALL getScrollRow() override; + virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override; // XPane methods - virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; protected: css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index fff859362c9d..db42296a52c4 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -26,7 +26,7 @@ ScVbaPivotCache::ScVbaPivotCache( const uno::Reference< XHelperInterface >& xPar } void SAL_CALL -ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException, std::exception) +ScVbaPivotCache::Refresh() { m_xTable->refresh(); } diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 417d20370c02..f7004774dffc 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -32,7 +32,7 @@ class ScVbaPivotCache : public PivotCacheImpl_BASE public: ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Refresh() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 2e3758f7f388..a8af3db58e2a 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -27,7 +27,7 @@ ScVbaPivotTable::ScVbaPivotTable( const uno::Reference< uno::XComponentContext > } uno::Reference< excel::XPivotCache > -ScVbaPivotTable::PivotCache() throw (uno::RuntimeException, std::exception) +ScVbaPivotTable::PivotCache() { // #FIXME with a quick example failed to determine what the parent // should be, leaving as null at the moment diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index b673f6a730ea..eb16e9905efe 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -31,7 +31,7 @@ class ScVbaPivotTable : public PivotTableImpl_BASE css::uno::Reference< css::sheet::XDataPilotTable > m_xTable; public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 97facba0c103..f60c5e53b7db 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -34,9 +34,9 @@ class PivotTableEnumeration : public EnumerationHelperImpl { public: /// @throws uno::RuntimeException - PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} + PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext ); } @@ -48,7 +48,7 @@ ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xP } uno::Reference< container::XEnumeration > -ScVbaPivotTables::createEnumeration() throw (uno::RuntimeException) +ScVbaPivotTables::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new PivotTableEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration() ); @@ -61,7 +61,7 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaPivotTables::getElementType() throw (uno::RuntimeException) +ScVbaPivotTables::getElementType() { return cppu::UnoType<excel::XPivotTable>::get(); } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 908afee55bd1..5b95d9724472 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -37,8 +37,8 @@ public: ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XPivotTables diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 8599c4450e44..4d444f2aaebc 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -253,7 +253,7 @@ static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const return xRange; } -ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException ) +ScCellRangesBase* ScVbaRange::getCellRangesBase() { if( mxRanges.is() ) return ScCellRangesBase::getImplementation( mxRanges ); @@ -262,12 +262,12 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException throw uno::RuntimeException("General Error creating range - Unknown" ); } -ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) +ScCellRangeObj* ScVbaRange::getCellRangeObj() { return dynamic_cast< ScCellRangeObj* >( getCellRangesBase() ); } -SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw (uno::RuntimeException, std::exception) +SfxItemSet* ScVbaRange::getCurrentDataSet( ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) @@ -299,9 +299,9 @@ class SingleRangeEnumeration : public EnumerationHelper_BASE bool bHasMore; public: /// @throws uno::RuntimeException - explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), bHasMore( true ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return bHasMore; } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ), bHasMore( true ) { } + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return bHasMore; } + virtual uno::Any SAL_CALL nextElement( ) override { if ( !bHasMore ) throw container::NoSuchElementException(); @@ -322,18 +322,18 @@ private: public: explicit SingleRangeIndexAccess( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ) {} // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) override { return 1; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return 1; } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index != 0 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( m_xRange ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return true; } + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<table::XCellRange>::get(); } + virtual sal_Bool SAL_CALL hasElements() override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); } + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override { return new SingleRangeEnumeration( m_xRange ); } }; @@ -343,8 +343,8 @@ class RangesEnumerationImpl : public EnumerationHelperImpl bool mbIsColumns; public: /// @throws uno::RuntimeException - RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} + virtual uno::Any SAL_CALL nextElement( ) override { return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns ); } @@ -358,10 +358,10 @@ public: ScVbaRangeAreas( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( xParent, xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) override; + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) override { return cppu::UnoType<excel::XRange>::get(); } + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XRange>::get(); } virtual uno::Any createCollectionObject( const uno::Any& aSource ) override; @@ -372,7 +372,7 @@ public: }; uno::Reference< container::XEnumeration > SAL_CALL -ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException) +ScVbaRangeAreas::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new RangesEnumerationImpl( mxParent, mxContext, xEnumAccess->createEnumeration(), mbIsRows, mbIsColumns ); @@ -387,7 +387,7 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource ) // assume that xIf is infact a ScCellRangesBase /// @throws uno::RuntimeException ScDocShell* -getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException ) +getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) @@ -397,7 +397,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R /// @throws uno::RuntimeException ScDocShell* -getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) +getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) { // need the ScCellRangesBase to get docshell uno::Reference< uno::XInterface > xIf( xRange ); @@ -406,7 +406,7 @@ getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw /// @throws uno::RuntimeException ScDocShell* -getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException ) +getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) { // need the ScCellRangesBase to get docshell uno::Reference< uno::XInterface > xIf( xRanges ); @@ -414,14 +414,14 @@ getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& } /// @throws uno::RuntimeException -uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException ) +uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) { ScDocShell* pDocShell = getDocShellFromIf(xIf ); return pDocShell->GetModel(); } /// @throws uno::RuntimeException -uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) +uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) { // the XInterface for getImplementation can be any derived interface, no need for queryInterface uno::Reference< uno::XInterface > xIf( xRange ); @@ -439,7 +439,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) } ScDocument& -ScVbaRange::getScDocument() throw (uno::RuntimeException) +ScVbaRange::getScDocument() { if ( mxRanges.is() ) { @@ -451,7 +451,7 @@ ScVbaRange::getScDocument() throw (uno::RuntimeException) } ScDocShell* -ScVbaRange::getScDocShell() throw (uno::RuntimeException) +ScVbaRange::getScDocShell() { if ( mxRanges.is() ) { @@ -468,28 +468,28 @@ ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange > return dynamic_cast< ScVbaRange* >( rxRange.get() ); } -uno::Reference< frame::XModel > ScVbaRange::getUnoModel() throw (uno::RuntimeException) +uno::Reference< frame::XModel > ScVbaRange::getUnoModel() { if( ScDocShell* pDocShell = getScDocShell() ) return pDocShell->GetModel(); throw uno::RuntimeException(); } -uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getUnoModel(); throw uno::RuntimeException(); } -const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) +const ScRangeList& ScVbaRange::getScRangeList() { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); throw uno::RuntimeException("Cannot obtain UNO range implementation object" ); } -const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); @@ -626,9 +626,9 @@ public: { } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return mCurElem < mMaxElems; } + virtual sal_Bool SAL_CALL hasMoreElements() override { return mCurElem < mMaxElems; } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement() override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -646,7 +646,7 @@ class CellsEnumeration : public CellsEnumeration_BASE vCellPos::const_iterator m_it; /// @throws uno::RuntimeException - uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException ) + uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) { if ( nVBAIndex < 1 || nVBAIndex > m_xAreas->getCount() ) throw uno::RuntimeException(); @@ -677,9 +677,9 @@ public: } m_it = m_CellPositions.begin(); } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return m_it != m_CellPositions.end(); } + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_it != m_CellPositions.end(); } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement() override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -1097,42 +1097,42 @@ class RangeHelper public: /// @throws uno::RuntimeException - explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) throw (uno::RuntimeException) : m_xCellRange( xCellRange ) + explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) : m_xCellRange( xCellRange ) { if ( !m_xCellRange.is() ) throw uno::RuntimeException(); } /// @throws uno::RuntimeException - explicit RangeHelper( const uno::Any& rCellRange ) throw (uno::RuntimeException) + explicit RangeHelper( const uno::Any& rCellRange ) { m_xCellRange.set(rCellRange, uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSheetCellRange > getSheetCellRange() throw (uno::RuntimeException) + uno::Reference< sheet::XSheetCellRange > getSheetCellRange() { return uno::Reference< sheet::XSheetCellRange >(m_xCellRange, uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSpreadsheet > getSpreadSheet() throw (uno::RuntimeException) + uno::Reference< sheet::XSpreadsheet > getSpreadSheet() { return getSheetCellRange()->getSpreadsheet(); } /// @throws uno::RuntimeException - uno::Reference< table::XCellRange > getCellRangeFromSheet() throw (uno::RuntimeException) + uno::Reference< table::XCellRange > getCellRangeFromSheet() { return uno::Reference< table::XCellRange >(getSpreadSheet(), uno::UNO_QUERY_THROW ); } /// @throws uno::RuntimeException - uno::Reference< sheet::XCellRangeAddressable > getCellRangeAddressable() throw (uno::RuntimeException) + uno::Reference< sheet::XCellRangeAddressable > getCellRangeAddressable() { return uno::Reference< sheet::XCellRangeAddressable >(m_xCellRange, ::uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException ) + uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() { return uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW ); } @@ -1167,7 +1167,7 @@ ScVbaRange::getCellRangesForAddress( ScRefFlags& rResFlags, const OUString& sAdd return false; } -bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv ) throw ( uno::RuntimeException ) +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv ) { // see if there is a match with a named range uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); @@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang /// @throws uno::RuntimeException ScVbaRange* -getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException, std::exception ) +getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) { ScRangeList aCellRanges; ScRange refRange; @@ -1265,13 +1265,13 @@ namespace { /// @throws uno::RuntimeException template< typename RangeType > -inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange ) throw (uno::RuntimeException) +inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange ) { return uno::Reference< sheet::XCellRangeAddressable >( rxCellRange, uno::UNO_QUERY_THROW )->getRangeAddress(); } /// @throws uno::RuntimeException -void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException) +void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | ANNOTATION | FORMULA | HARDATTR | STYLES | EDITATTR | FORMATTED; @@ -1280,7 +1280,7 @@ void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) thr } /// @throws uno::RuntimeException -uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) throw (uno::RuntimeException) +uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) { uno::Reference< sheet::XSheetCellRange > xNewCellRange( rxCellRange, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xNewCellRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -1300,7 +1300,7 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference } /// @throws uno::RuntimeException -uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) +uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) { if( !rxCellRanges.is() ) throw uno::RuntimeException("Missing cell ranges object" ); @@ -1321,7 +1321,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno:: } /// @throws uno::RuntimeException -void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) throw (uno::RuntimeException) +void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) { uno::Reference< util::XMergeable > xMerge( lclExpandToMerged( rxCellRange, true ), uno::UNO_QUERY_THROW ); // Calc cannot merge over merged ranges, always unmerge first @@ -1344,7 +1344,7 @@ void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, } /// @throws uno::RuntimeException -util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException) +util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) { /* 1) Check if range is completely inside one single merged range. To do this, try to extend from top-left cell only (not from entire range). @@ -1374,14 +1374,14 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, - ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException, std::exception ) + ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) { table::CellRangeAddress refAddr; return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv ); } /// @throws uno::RuntimeException -table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) throw ( uno::RuntimeException ) +table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) { uno::Reference< table::XCellRange > xRangeParam; switch ( aParam.getValueTypeClass() ) @@ -1421,7 +1421,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, /// @throws uno::RuntimeException static uno::Reference< XCollection > -lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) throw( uno::RuntimeException ) +lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) { uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument& rDoc = getDocumentFromRange(xRange); @@ -1431,7 +1431,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno } ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) + uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) { mxRange.set( mxPropertySet, uno::UNO_QUERY ); mxRanges.set( mxPropertySet, uno::UNO_QUERY ); @@ -1447,7 +1447,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); } -ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) throw( lang::IllegalArgumentException ) +ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) @@ -1463,7 +1463,6 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const } ScVbaRange::ScVbaRange(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows, bool bIsColumns) - throw (lang::IllegalArgumentException, uno::RuntimeException) : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) { @@ -1504,7 +1503,7 @@ ScVbaRange::visitArray( ArrayVisitor& visitor ) } uno::Any -ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException) +ScVbaRange::getValue( ValueGetter& valueGetter) { uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW ); // single cell range @@ -1522,7 +1521,7 @@ ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) +ScVbaRange::getValue() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1540,7 +1539,7 @@ ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw (uno::RuntimeException) +ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) { uno::TypeClass aClass = aValue.getValueTypeClass(); if ( aClass == uno::TypeClass_SEQUENCE ) @@ -1577,7 +1576,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw ( } void SAL_CALL -ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setValue( const uno::Any &aValue ) { // If this is a multiple selection apply setValue over all areas if ( m_Areas->getCount() > 1 ) @@ -1592,7 +1591,7 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException, st } void SAL_CALL -ScVbaRange::Clear() throw (uno::RuntimeException, std::exception) +ScVbaRange::Clear() { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED; @@ -1601,7 +1600,7 @@ ScVbaRange::Clear() throw (uno::RuntimeException, std::exception) //helper ClearContent void -ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::RuntimeException) +ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1628,13 +1627,13 @@ ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::Runti } void SAL_CALL -ScVbaRange::ClearComments() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearComments() { ClearContents( sheet::CellFlags::ANNOTATION, false ); } void SAL_CALL -ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearContents() { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA; @@ -1642,7 +1641,7 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearFormats() { // FIXME: need to check if we need to combine FORMATTED using namespace ::com::sun::star::sheet::CellFlags; @@ -1651,7 +1650,7 @@ ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException) +ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) { // If this is a multiple selection apply setFormula over all areas if ( m_Areas->getCount() > 1 ) @@ -1666,7 +1665,7 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar:: } uno::Any -ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException) +ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1683,32 +1682,32 @@ ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno } void -ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormula(const uno::Any &rFormula ) { // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } uno::Any -ScVbaRange::getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getFormulaR1C1() { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } void -ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) { setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } uno::Any -ScVbaRange::getFormula() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getFormula() { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } sal_Int32 -ScVbaRange::getCount() throw (uno::RuntimeException, std::exception) +ScVbaRange::getCount() { // If this is a multiple selection apply setValue over all areas if ( m_Areas->getCount() > 1 ) @@ -1732,7 +1731,7 @@ ScVbaRange::getCount() throw (uno::RuntimeException, std::exception) } sal_Int32 -ScVbaRange::getRow() throw (uno::RuntimeException, std::exception) +ScVbaRange::getRow() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1748,7 +1747,7 @@ ScVbaRange::getRow() throw (uno::RuntimeException, std::exception) } sal_Int32 -ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception) +ScVbaRange::getColumn() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1764,7 +1763,7 @@ ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception) } uno::Any -ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) +ScVbaRange::HasFormula() { if ( m_Areas->getCount() > 1 ) { @@ -1805,7 +1804,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) return uno::makeAny( true ); } void -ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException ) +ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) { if ( m_Areas->getCount() > 1 ) { @@ -1827,35 +1826,35 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi } void -ScVbaRange::FillLeft() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillLeft() { fillSeries(sheet::FillDirection_TO_LEFT, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillRight() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillRight() { fillSeries(sheet::FillDirection_TO_RIGHT, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillUp() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillUp() { fillSeries(sheet::FillDirection_TO_TOP, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillDown() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillDown() { fillSeries(sheet::FillDirection_TO_BOTTOM, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } OUString -ScVbaRange::getText() throw (uno::RuntimeException, std::exception) +ScVbaRange::getText() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1871,7 +1870,7 @@ ScVbaRange::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) { SCROW nRowOffset = 0; SCCOL nColOffset = 0; @@ -1907,7 +1906,7 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw ( } uno::Reference< excel::XRange > -ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception) +ScVbaRange::CurrentRegion() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1928,7 +1927,7 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception) +ScVbaRange::CurrentArray() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1948,7 +1947,7 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception) } uno::Any -ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception) +ScVbaRange::getFormulaArray() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1986,7 +1985,7 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormulaArray(const uno::Any& rFormula) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2022,7 +2021,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti } OUString -ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException, std::exception) +ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2048,7 +2047,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno } OUString -ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) { if ( m_Areas->getCount() > 1 ) { @@ -2123,7 +2122,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut } uno::Reference < excel::XFont > -ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) +ScVbaRange::Font() { uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY ); ScDocument& rDoc = getScDocument(); @@ -2145,7 +2144,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) } uno::Reference< excel::XRange > -ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException, std::exception) +ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2167,7 +2166,7 @@ uno::Reference< excel::XRange > ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::table::XCellRange >& xRange, - const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException) + const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) { sal_Int32 nRow = 0, nColumn = 0; @@ -2245,7 +2244,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, } void -ScVbaRange::Select() throw (uno::RuntimeException, std::exception) +ScVbaRange::Select() { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) @@ -2295,7 +2294,7 @@ void setCursor( SCCOL nCol, SCROW nRow, const uno::Reference< frame::XModel >& x } void -ScVbaRange::Activate() throw (uno::RuntimeException, std::exception) +ScVbaRange::Activate() { // get first cell of current range uno::Reference< table::XCellRange > xCellRange; @@ -2355,7 +2354,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Rows(const uno::Any& aIndex ) { OUString sAddress; @@ -2398,7 +2397,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exc } uno::Reference< excel::XRange > -ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Columns(const uno::Any& aIndex ) { OUString sAddress; @@ -2438,7 +2437,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std:: } void -ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) { bool bMerge = extractBoolFromAny( aIsMerged ); @@ -2472,7 +2471,7 @@ ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicError } uno::Any -ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::getMergeCells() { if( mxRanges.is() ) { @@ -2501,7 +2500,7 @@ ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeExce } void -ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception) +ScVbaRange::Copy(const ::uno::Any& Destination) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2531,7 +2530,7 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, st } void -ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception) +ScVbaRange::Cut(const ::uno::Any& Destination) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2557,7 +2556,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std } void -ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setNumberFormat( const uno::Any& aFormat ) { OUString sFormat; aFormat >>= sFormat; @@ -2576,7 +2575,7 @@ ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErro } uno::Any -ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getNumberFormat() { if ( m_Areas->getCount() > 1 ) @@ -2605,7 +2604,7 @@ ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeEx } uno::Reference< excel::XRange > -ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) { long nRowSize = 0, nColumnSize = 0; bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize ); @@ -2629,7 +2628,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw } void -ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) { if ( m_Areas->getCount() > 1 ) { @@ -2648,7 +2647,7 @@ ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorE } uno::Any -ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getWrapText() { if ( m_Areas->getCount() > 1 ) { @@ -2676,18 +2675,18 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept return aValue; } -uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::BasicErrorException, uno::RuntimeException) +uno::Reference< excel::XInterior > ScVbaRange::Interior( ) { uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW ); return new ScVbaInterior ( this, mxContext, xProps, &getScDocument() ); } uno::Reference< excel::XRange > -ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) { return Range( Cell1, Cell2, false ); } uno::Reference< excel::XRange > -ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) { uno::Reference< table::XCellRange > xCellRange = mxRange; @@ -2788,7 +2787,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI // Allow access to underlying openoffice uno api ( useful for debugging // with openoffice basic ) -uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaRange::getCellRange( ) { uno::Any aAny; if ( mxRanges.is() ) @@ -2798,7 +2797,7 @@ uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException, std return aAny; } -uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pVbaRange = getImplementation( rxRange ) ) return pVbaRange->getCellRange(); @@ -2854,7 +2853,7 @@ getPasteFormulaBits( sal_Int32 Operation) return nFormulaBits; } void SAL_CALL -ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) +ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2888,7 +2887,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons } uno::Reference< excel::XRange > -ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException) +ScVbaRange::getEntireColumnOrRow( bool bColumn ) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); // copy the range list @@ -2919,19 +2918,19 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException) } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::getEntireRow() throw (uno::RuntimeException, std::exception) +ScVbaRange::getEntireRow() { return getEntireColumnOrRow(false); } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::getEntireColumn() throw (uno::RuntimeException, std::exception) +ScVbaRange::getEntireColumn() { return getEntireColumnOrRow(true); } uno::Reference< excel::XComment > SAL_CALL -ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std::exception) +ScVbaRange::AddComment( const uno::Any& Text ) { // if there is already a comment in the top-left cell then throw if( getComment().is() ) @@ -2955,7 +2954,7 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std } uno::Reference< excel::XComment > SAL_CALL -ScVbaRange::getComment() throw (uno::RuntimeException, std::exception) +ScVbaRange::getComment() { // intentional behavior to return a null object if no // comment defined @@ -2968,7 +2967,7 @@ ScVbaRange::getComment() throw (uno::RuntimeException, std::exception) /// @throws uno::RuntimeException uno::Reference< beans::XPropertySet > -getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) throw ( uno::RuntimeException ) +getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) { uno::Reference< table::XColumnRowRange > xColRow( xCellRange, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps; @@ -2980,7 +2979,7 @@ getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool } uno::Any SAL_CALL -ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception) +ScVbaRange::getHidden() { // if multi-area result is the result of the // first area @@ -3004,7 +3003,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setHidden( const uno::Any& _hidden ) { if ( m_Areas->getCount() > 1 ) { @@ -3030,7 +3029,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, s } sal_Bool SAL_CALL -ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) { if ( m_Areas->getCount() > 1 ) { @@ -3132,7 +3131,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) { // return a Range object that represents the first cell where that information is found. OUString sWhat; @@ -3321,7 +3320,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere // helper method for Sort /// @throws uno::RuntimeException sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props, -const OUString& sPropName ) throw( uno::RuntimeException ) +const OUString& sPropName ) { const beans::PropertyValue* pProp = props.getConstArray(); sal_Int32 nItems = props.getLength(); @@ -3339,7 +3338,7 @@ const OUString& sPropName ) throw( uno::RuntimeException ) /// @throws uno::RuntimeException void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange, const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder, - table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase ) throw ( uno::RuntimeException ) + table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase ) { RangeHelper parentRange( xParentRange ); RangeHelper colRowRange( xColRowKey ); @@ -3373,7 +3372,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan } void SAL_CALL -ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod, const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3 ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod, const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3 ) { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) @@ -3549,7 +3548,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException, std::exception) +ScVbaRange::End( ::sal_Int32 Direction ) { if ( m_Areas->getCount() > 1 ) { @@ -3640,7 +3639,7 @@ ScVbaRange::isSingleCellRange() } uno::Reference< excel::XCharacters > SAL_CALL -ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception) +ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) { if ( !isSingleCellRange() ) throw uno::RuntimeException("Can't create Characters property for multicell range " ); @@ -3652,7 +3651,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u } void SAL_CALL -ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Delete( const uno::Any& Shift ) { if ( m_Areas->getCount() > 1 ) { @@ -3700,7 +3699,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::e //XElementAccess sal_Bool SAL_CALL -ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception) +ScVbaRange::hasElements() { uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY ); if ( xColumnRowRange.is() ) @@ -3712,7 +3711,7 @@ ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception) // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL -ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception) +ScVbaRange::createEnumeration() { if ( mbIsColumns || mbIsRows ) { @@ -3730,7 +3729,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException, std::exception) +ScVbaRange::getDefaultMethodName( ) { return OUString( "Item" ); } @@ -3738,7 +3737,6 @@ ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException, std::exceptio // returns calc internal col. width ( in points ) double ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress) - throw (uno::RuntimeException, std::exception) { ScDocument& rDoc = getScDocument(); sal_uInt16 nWidth = rDoc.GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) ); @@ -3749,7 +3747,6 @@ ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress) double ScVbaRange::getCalcRowHeight(const table::CellRangeAddress& rAddress) - throw (uno::RuntimeException, std::exception) { ScDocument& rDoc = getDocumentFromRange( mxRange ); sal_uInt16 nWidth = rDoc.GetOriginalHeight( rAddress.StartRow, rAddress.Sheet ); @@ -3772,7 +3769,7 @@ double getDefaultCharWidth( ScDocShell* pDocShell ) } uno::Any SAL_CALL -ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception) +ScVbaRange::getColumnWidth() { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3809,7 +3806,7 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3841,7 +3838,7 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx } uno::Any SAL_CALL -ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception) +ScVbaRange::getWidth() { if ( m_Areas->getCount() > 1 ) { @@ -3862,7 +3859,7 @@ ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exception) +ScVbaRange::Areas( const uno::Any& item) { if ( !item.hasValue() ) return uno::makeAny( m_Areas ); @@ -3870,7 +3867,7 @@ ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exce } uno::Reference< excel::XRange > -ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) +ScVbaRange::getArea( sal_Int32 nIndex ) { if ( !m_Areas.is() ) throw uno::RuntimeException("No areas available" ); @@ -3879,7 +3876,7 @@ ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) } uno::Any -ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::RuntimeException ) +ScVbaRange::Borders( const uno::Any& item ) { if ( !item.hasValue() ) return uno::makeAny( getBorders() ); @@ -3888,7 +3885,7 @@ ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::Any SAL_CALL ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& Weight, - const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) + const css::uno::Any& ColorIndex, const css::uno::Any& Color ) { sal_Int32 nCount = getBorders()->getCount(); @@ -3935,7 +3932,6 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W uno::Any SAL_CALL ScVbaRange::getRowHeight() - throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3974,7 +3970,7 @@ ScVbaRange::getRowHeight() } void SAL_CALL -ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException, std::exception) +ScVbaRange::setRowHeight( const uno::Any& _rowheight) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -4000,7 +3996,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception) +ScVbaRange::getPageBreak() { sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone; ScDocShell* pShell = getDocShellFromRange( mxRange ); @@ -4036,7 +4032,7 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException, std::exception) +ScVbaRange::setPageBreak( const uno::Any& _pagebreak) { sal_Int32 nPageBreak = 0; _pagebreak >>= nPageBreak; @@ -4067,7 +4063,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception) +ScVbaRange::getHeight() { if ( m_Areas->getCount() > 1 ) { @@ -4088,7 +4084,7 @@ ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception) } awt::Point -ScVbaRange::getPosition() throw ( uno::RuntimeException ) +ScVbaRange::getPosition() { awt::Point aPoint; uno::Reference< beans::XPropertySet > xProps; @@ -4100,7 +4096,7 @@ ScVbaRange::getPosition() throw ( uno::RuntimeException ) return aPoint; } uno::Any SAL_CALL -ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) +ScVbaRange::getLeft() { // helperapi returns the first ranges left ( and top below ) if ( m_Areas->getCount() > 1 ) @@ -4110,7 +4106,7 @@ ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) +ScVbaRange::getTop() { // helperapi returns the first ranges top if ( m_Areas->getCount() > 1 ) @@ -4143,7 +4139,7 @@ uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Reference< } uno::Reference< excel::XName > -ScVbaRange::getName() throw (uno::RuntimeException, std::exception) +ScVbaRange::getName() { uno::Reference< beans::XPropertySet > xProps( getUnoModel(), uno::UNO_QUERY ); uno::Reference< table::XCellRange > thisRange( getCellRange(), uno::UNO_QUERY_THROW ); @@ -4170,7 +4166,7 @@ ScVbaRange::getName() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWorksheet > -ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception) +ScVbaRange::getWorksheet() { // #TODO #FIXME parent should always be set up ( currently thats not // the case ) @@ -4195,7 +4191,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception) // #TODO remove this ugly application processing // Process an application Range request e.g. 'Range("a1,b2,a4:b6") uno::Reference< excel::XRange > -ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) +ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) { // Although the documentation seems clear that Range without a // qualifier then it's a shortcut for ActiveSheet.Range @@ -4376,7 +4372,6 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference void SAL_CALL ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& /*VisibleDropDown*/ ) - throw (uno::RuntimeException, std::exception) { // Is there an existing autofilter RangeHelper thisRange( mxRange ); @@ -4621,7 +4616,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const } void SAL_CALL -ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) { // It appears ( from the web ) that the undocumented CopyOrigin // param should contain member of enum XlInsertFormatOrigin @@ -4672,7 +4667,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro } void SAL_CALL -ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Autofit() { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -4709,7 +4704,7 @@ ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException, } uno::Any SAL_CALL -ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Hyperlinks( const uno::Any& aIndex ) { /* The range object always returns a new Hyperlinks object containing a fixed list of existing hyperlinks in the range. @@ -4730,7 +4725,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, s } css::uno::Reference< excel::XValidation > SAL_CALL -ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getValidation() { if ( !m_xValidation.is() ) m_xValidation = new ScVbaValidation( this, mxContext, mxRange ); @@ -4740,7 +4735,7 @@ ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception) namespace { /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) { /* TODO/FIXME: We need an apostroph-prefix property at the cell to implement this correctly. For now, return an apostroph for every text @@ -4754,7 +4749,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) thr } /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange ) { /* This implementation is able to handle different prefixes (needed if Application.TransitionNavigKeys is true). The function lclGetPrefixChar @@ -4782,7 +4777,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange } /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges ) { sal_Unicode cCurrPrefix = 0; uno::Reference< container::XEnumerationAccess > xRangesEA( rxRanges, uno::UNO_QUERY_THROW ); @@ -4806,7 +4801,7 @@ inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar ) } // namespace -uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() { /* (1) If Application.TransitionNavigKeys is false, this function returns an apostroph character if the text cell begins with an apostroph @@ -4831,7 +4826,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException, throw uno::RuntimeException("Unexpected empty Range object" ); } -uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::exception) +uno::Any ScVbaRange::getShowDetail() { // #FIXME, If the specified range is in a PivotTable report @@ -4869,7 +4864,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::ex return aNULL(); } -void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::RuntimeException, std::exception) +void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) { // #FIXME, If the specified range is in a PivotTable report @@ -4905,7 +4900,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::MergeArea() { uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW); uno::Reference< sheet::XSheetCellCursor > xMergeSheetCursor(xMergeShellCellRange->getSpreadsheet()->createCursorByRange( xMergeShellCellRange ), uno::UNO_QUERY_THROW); @@ -4934,7 +4929,7 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio } void SAL_CALL -ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception) +ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) { ScDocShell* pShell = nullptr; @@ -4968,7 +4963,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& } void SAL_CALL -ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException, std::exception) +ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) { uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW ); ScVbaRange* pRange = getImplementation( xDest ); @@ -5083,7 +5078,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const nCount, fStep, fEndValue, true, true ); } sal_Bool SAL_CALL -ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException, std::exception) +ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) { ScDocShell* pDocShell = getScDocShell(); bool bRes = true; @@ -5113,13 +5108,13 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange } void -ScVbaRange::Calculate( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Calculate( ) { getWorksheet()->Calculate(); } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) { if ( mbIsRows || mbIsColumns ) { @@ -5136,7 +5131,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B } void -ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::AutoOutline( ) { // #TODO #FIXME needs to check for summary row/col ( whatever they are ) // not valid for multi Area Addresses @@ -5160,7 +5155,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaRange:: ClearOutline( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange:: ClearOutline( ) { if ( m_Areas->getCount() > 1 ) { @@ -5178,7 +5173,7 @@ ScVbaRange:: ClearOutline( ) throw (script::BasicErrorException, uno::RuntimeEx } void -ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaRange::groupUnGroup( bool bUnGroup ) { if ( m_Areas->getCount() > 1 ) DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); @@ -5195,24 +5190,24 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u } void SAL_CALL -ScVbaRange::Group( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Group( ) { groupUnGroup(false); } void SAL_CALL -ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Ungroup( ) { groupUnGroup(true); } /// @throws uno::RuntimeException -static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) throw ( uno::RuntimeException ) +static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) { uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW ); xMergeable->merge(_bMerge); } void SAL_CALL -ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Merge( const uno::Any& Across ) { if ( m_Areas->getCount() > 1 ) { @@ -5241,7 +5236,7 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, } void SAL_CALL -ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::UnMerge( ) { if ( m_Areas->getCount() > 1 ) { @@ -5257,7 +5252,7 @@ ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getStyle() { if ( m_Areas->getCount() > 1 ) { @@ -5273,7 +5268,7 @@ ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeExce return uno::makeAny( xStyle ); } void SAL_CALL -ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setStyle( const uno::Any& _style ) { if ( m_Areas->getCount() > 1 ) { @@ -5317,7 +5312,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious ) } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Next() { if ( m_Areas->getCount() > 1 ) { @@ -5328,7 +5323,7 @@ ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, st } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Previous() { if ( m_Areas->getCount() > 1 ) { @@ -5340,8 +5335,6 @@ ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException uno::Reference< excel::XRange > SAL_CALL ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) - throw (script::BasicErrorException, uno::RuntimeException, - std::exception) { bool bIsSingleCell = isSingleCellRange(); bool bIsMultiArea = ( m_Areas->getCount() > 1 ); @@ -5422,7 +5415,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) } /// @throws script::BasicErrorException -static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException ) +static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) { sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers; aType >>= nType; @@ -5450,7 +5443,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script } uno::Reference< excel::XRange > -ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException ) +ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) { uno::Reference< excel::XRange > xRange; try @@ -5506,14 +5499,14 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( } void SAL_CALL -ScVbaRange::RemoveSubtotal( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::RemoveSubtotal( ) { uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW ); xSub->removeSubTotals(); } void SAL_CALL -ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) { try { @@ -5602,7 +5595,7 @@ ScVbaRange::getServiceNames() } sal_Bool SAL_CALL -ScVbaRange::hasError() throw (uno::RuntimeException, std::exception) +ScVbaRange::hasError() { double dResult = 0.0; uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 958d43b27abb..73cd9de39ea5 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -88,79 +88,77 @@ class ScVbaRange : public ScVbaRange_BASE bool mbIsColumns; css::uno::Reference< ov::excel::XValidation > m_xValidation; /// @throws css::uno::RuntimeException - double getCalcColWidth(const css::table::CellRangeAddress&) - throw (css::uno::RuntimeException, std::exception); + double getCalcColWidth(const css::table::CellRangeAddress&); /// @throws css::uno::RuntimeException - double getCalcRowHeight(const css::table::CellRangeAddress&) - throw (css::uno::RuntimeException, std::exception); + double getCalcRowHeight(const css::table::CellRangeAddress&); void visitArray( ArrayVisitor& vistor ); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ) throw( css::uno::RuntimeException ); + css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ); /// @throws css::uno::RuntimeException - void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException ); + void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ); /// @throws css::uno::RuntimeException - void ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (css::uno::RuntimeException); + void ClearContents( sal_Int32 nFlags, bool bFireEvent ); /// @throws css::uno::RuntimeException - css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException); + css::uno::Any getValue( ValueGetter& rValueGetter ); /// @throws css::uno::RuntimeException - void setValue( const css::uno::Any& aValue, ValueSetter& setter ) throw ( css::uno::RuntimeException); + void setValue( const css::uno::Any& aValue, ValueSetter& setter ); /// @throws css::uno::RuntimeException - css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException); + css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ); /// @throws css::uno::RuntimeException - void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ) throw ( css::uno::RuntimeException); + void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ); + css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex ); /// @throws css::uno::RuntimeException - ScCellRangeObj* getCellRangeObj( ) throw ( css::uno::RuntimeException ); + ScCellRangeObj* getCellRangeObj( ); css::uno::Reference< ov::XCollection >& getBorders(); /// @throws css::uno::RuntimeException - void groupUnGroup( bool bUnGroup ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + void groupUnGroup( bool bUnGroup ); css::uno::Reference< ov::excel::XRange > PreviousNext( bool bIsPrevious ); /// @throws css::script::BasicErrorException - css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); + css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue); /// @throws css::uno::RuntimeException - css::awt::Point getPosition() throw ( css::uno::RuntimeException ); + css::awt::Point getPosition(); /** Fires a Worksheet_Change event for this range or range list. */ void fireChangeEvent(); protected: - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) override; + virtual ScCellRangesBase* getCellRangesBase() override; /// @throws css::uno::RuntimeException - SfxItemSet* getCurrentDataSet() throw (css::uno::RuntimeException, std::exception); + SfxItemSet* getCurrentDataSet(); public: /// @throws css::lang::IllegalArgumentException - ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); + ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); /// @throws css::uno::RuntimeException - ScDocument& getScDocument() throw (css::uno::RuntimeException); + ScDocument& getScDocument(); /// @throws css::uno::RuntimeException - ScDocShell* getScDocShell() throw (css::uno::RuntimeException); + ScDocShell* getScDocShell(); /** Returns the ScVbaRange implementation object for the passed VBA Range object. */ static ScVbaRange* getImplementation( const css::uno::Reference< ov::excel::XRange >& rxRange ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::frame::XModel > getUnoModel() throw (css::uno::RuntimeException); + css::uno::Reference< css::frame::XModel > getUnoModel(); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); + static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange ); /// @throws css::uno::RuntimeException - const ScRangeList& getScRangeList() throw (css::uno::RuntimeException); + const ScRangeList& getScRangeList(); /// @throws css::uno::RuntimeException - static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); + static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ); virtual ~ScVbaRange() override; virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; } @@ -170,145 +168,138 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, - formula::FormulaGrammar::AddressConvention eConv ) throw ( css::uno::RuntimeException, std::exception ); + formula::FormulaGrammar::AddressConvention eConv ); /// @throws css::uno::RuntimeException static css::uno::Reference< ov::excel::XRange > CellsHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, - const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException); + const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getFormula() override; + virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) override; + virtual css::uno::Any SAL_CALL getFormulaArray() override; + virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) override; + virtual css::uno::Any SAL_CALL getFormulaR1C1() override; + virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual ::sal_Int32 SAL_CALL getRow() override; + virtual ::sal_Int32 SAL_CALL getColumn() override; + virtual OUString SAL_CALL getText() override; using ScVbaRange_BASE::setNumberFormat; - virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getRowHeight() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHeight() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) override; + virtual css::uno::Any SAL_CALL getNumberFormat() override; + virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) override; + virtual css::uno::Any SAL_CALL getMergeCells() override; + virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) override; + virtual css::uno::Any SAL_CALL getWrapText() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() override; + virtual css::uno::Any SAL_CALL getHidden() override; + virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) override; + virtual css::uno::Any SAL_CALL getColumnWidth() override; + virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) override; + virtual css::uno::Any SAL_CALL getRowHeight() override; + virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) override; + virtual css::uno::Any SAL_CALL getWidth() override; + virtual css::uno::Any SAL_CALL getHeight() override; + virtual css::uno::Any SAL_CALL getTop() override; + virtual css::uno::Any SAL_CALL getLeft() override; + + virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() override; + virtual css::uno::Any SAL_CALL getPageBreak() override; + virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) override; + virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() override; + virtual css::uno::Any SAL_CALL getPrefixCharacter() override; + virtual css::uno::Any SAL_CALL getShowDetail() override; + virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) override; // Methods - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) - throw (css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override ; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) override; + virtual void SAL_CALL Clear() override; + virtual void SAL_CALL ClearComments() override; + virtual void SAL_CALL ClearContents() override; + virtual void SAL_CALL ClearFormats() override; + virtual css::uno::Any SAL_CALL HasFormula() override; + virtual void SAL_CALL FillLeft() override; + virtual void SAL_CALL FillRight() override; + virtual void SAL_CALL FillUp() override; + virtual void SAL_CALL FillDown() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() override; + virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) override; + + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) override; + + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override; + virtual void SAL_CALL Select() override; + virtual void SAL_CALL Activate() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) override; + virtual void SAL_CALL Copy( const css::uno::Any& Destination ) override; + virtual void SAL_CALL Cut( const css::uno::Any& Destination ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() override; + virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) override ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ); + virtual css::uno::Any SAL_CALL getCellRange( ) override; /// @throws css::uno::RuntimeException - static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); - virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; + static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ); + virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) override; + virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) override; + virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) override; + virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override; + virtual void SAL_CALL Delete( const css::uno::Any& Shift ) override; + virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) override; virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle, - const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Autofit() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL 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::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override ; - void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL UnMerge( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStyle() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL RemoveSubtotal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) override; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override; + + virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) override; + virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) override; + virtual void SAL_CALL Autofit() override; + virtual void SAL_CALL 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 ) override; + virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) override ; + void SAL_CALL Calculate( ) override; + virtual void SAL_CALL AutoOutline( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) override; + virtual void SAL_CALL ClearOutline( ) override; + virtual void SAL_CALL Ungroup( ) override; + virtual void SAL_CALL Group( ) override; + virtual void SAL_CALL Merge( const css::uno::Any& Across ) override; + virtual void SAL_CALL UnMerge( ) override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() override; + virtual void SAL_CALL RemoveSubtotal( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() override; + virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<ov::excel::XRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() override; // XDefaultMethod - OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getDefaultMethodName( ) override; // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) override { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, it's become a hackfest // it needs to be closer to ScCellRangeBase in that the underlying @@ -318,13 +309,12 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below /// @throws css::uno::RuntimeException - static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception); + static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ); static bool getCellRangesForAddress(ScRefFlags &rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ); - virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) override; // XErrorQuery - virtual sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasError( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; @@ -333,8 +323,7 @@ public: /// @throws css::uno::RuntimeException bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, - formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) - throw ( css::uno::RuntimeException ); + formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ); #endif // INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 889754fea7b4..7764a137d148 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -42,7 +42,7 @@ ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< beans::XPropertySet >& rxPropSet, const ScVbaPalette& rPalette, const uno::Any& rStart, - const uno::Any& rLength ) throw (uno::RuntimeException) : + const uno::Any& rLength ) : ScVbaButtonCharacters_BASE( rxParent, rxContext ), maPalette( rPalette ), mxPropSet( rxPropSet, uno::UNO_SET_THROW ) @@ -63,7 +63,7 @@ ScVbaButtonCharacters::~ScVbaButtonCharacters() // XCharacters attributes -OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButtonCharacters::getCaption() { // ignore invalid mnStart and/or mnLength members OUString aString = getFullString(); @@ -72,7 +72,7 @@ OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeExcepti return aString.copy( nStart, nLength ); } -void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) { /* Replace the covered text with the passed text, ignore invalid mnStart and/or mnLength members. This operation does not affect the mnLength @@ -87,37 +87,37 @@ void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) thro setFullString( aString.replaceAt( nStart, nLength, rCaption ) ); } -sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount() { // always return the total length of the caption return getFullString().getLength(); } -OUString SAL_CALL ScVbaButtonCharacters::getText() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButtonCharacters::getText() { // Text attribute same as Caption attribute? return getCaption(); } -void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText ) { // Text attribute same as Caption attribute? setCaption( rText ); } -uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont() { return new ScVbaFont( this, mxContext, maPalette, mxPropSet, nullptr, true ); } -void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) { // TODO } // XCharacters methods -void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) { /* The Insert() operation is in fact "replace covered characters", at least for buttons... It seems there is no easy way to really insert a @@ -125,7 +125,7 @@ void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (un setCaption( rString ); } -void SAL_CALL ScVbaButtonCharacters::Delete() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::Delete() { /* The Delete() operation is nothing else than "replace with empty string". This does not affect the mnLength parameter, multiple calls of Delete() @@ -140,12 +140,12 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtonCharacters, "ooo.vba.excel.Character // private -OUString ScVbaButtonCharacters::getFullString() const throw (uno::RuntimeException) +OUString ScVbaButtonCharacters::getFullString() const { return mxPropSet->getPropertyValue( "Label" ).get< OUString >(); } -void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno::RuntimeException) +void ScVbaButtonCharacters::setFullString( const OUString& rString ) { mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } @@ -154,7 +154,7 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) : + const uno::Reference< drawing::XShape >& rxShape ) : ScVbaSheetObject_BASE( rxParent, rxContext ), maPalette( rxModel ), mxModel( rxModel, uno::UNO_SET_THROW ), @@ -165,65 +165,65 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase( // XSheetObject attributes -double SAL_CALL ScVbaSheetObjectBase::getLeft() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getLeft() { return HmmToPoints( mxShape->getPosition().X ); } -void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft ) { if( fLeft < 0.0 ) throw uno::RuntimeException(); mxShape->setPosition( awt::Point( PointsToHmm( fLeft ), mxShape->getPosition().Y ) ); } -double SAL_CALL ScVbaSheetObjectBase::getTop() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getTop() { return HmmToPoints( mxShape->getPosition().Y ); } -void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop ) { if( fTop < 0.0 ) throw uno::RuntimeException(); mxShape->setPosition( awt::Point( mxShape->getPosition().X, PointsToHmm( fTop ) ) ); } -double SAL_CALL ScVbaSheetObjectBase::getWidth() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getWidth() { return HmmToPoints( mxShape->getSize().Width ); } -void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth ) { if( fWidth <= 0.0 ) throw uno::RuntimeException(); mxShape->setSize( awt::Size( PointsToHmm( fWidth ), mxShape->getSize().Height ) ); } -double SAL_CALL ScVbaSheetObjectBase::getHeight() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getHeight() { return HmmToPoints( mxShape->getSize().Height ); } -void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) { if( fHeight <= 0.0 ) throw uno::RuntimeException(); mxShape->setSize( awt::Size( mxShape->getSize().Width, PointsToHmm( fHeight ) ) ); } -OUString SAL_CALL ScVbaSheetObjectBase::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaSheetObjectBase::getName() { return mxShapeProps->getPropertyValue( "Name" ).get< OUString >(); } -void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) { mxShapeProps->setPropertyValue( "Name", uno::Any( rName ) ); } -sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() { sal_Int32 nRet = excel::XlPlacement::xlMoveAndSize; #if 0 // TODO: not working at the moment. @@ -242,7 +242,7 @@ sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeExcep return nRet; } -void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) { #if 0 // TODO: not working at the moment. SvxShape* pShape = SvxShape::getImplementation( mxShape ); @@ -263,27 +263,27 @@ void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) thr #endif } -sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() { // not supported return true; } -void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) { // not supported } // private -void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException) +void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) { OUString aName = OUStringBuffer( implGetBaseName() ).append( ' ' ).append( nIndex + 1 ).makeStringAndClear(); setName( aName ); implSetDefaultProperties(); } -void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeException) +void ScVbaSheetObjectBase::implSetDefaultProperties() { } @@ -293,7 +293,7 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< frame::XModel >& rxModel, const uno::Reference< container::XIndexContainer >& rxFormIC, const uno::Reference< drawing::XControlShape >& rxControlShape, - ListenerType eListenerType ) throw (uno::RuntimeException) : + ListenerType eListenerType ) : ScVbaControlObject_BASE( rxParent, rxContext, rxModel, uno::Reference< drawing::XShape >( rxControlShape, uno::UNO_QUERY_THROW ) ), mxFormIC( rxFormIC, uno::UNO_SET_THROW ), mxControlProps( rxControlShape->getControl(), uno::UNO_QUERY_THROW ) @@ -327,17 +327,17 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( // XSheetObject attributes -OUString SAL_CALL ScVbaControlObjectBase::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaControlObjectBase::getName() { return mxControlProps->getPropertyValue( "Name" ).get< OUString >(); } -void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) { mxControlProps->setPropertyValue( "Name", uno::Any( rName ) ); } -OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaControlObjectBase::getOnAction() { uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW ); sal_Int32 nIndex = getModelIndexInForm(); @@ -354,7 +354,7 @@ OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeExcep return OUString(); } -void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) { uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW ); sal_Int32 nIndex = getModelIndexInForm(); @@ -377,32 +377,32 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) } } -sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() { return mxControlProps->getPropertyValue( "Printable" ).get<bool>(); } -void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) { mxControlProps->setPropertyValue( "Printable", uno::Any( bPrintObject ) ); } // XControlObject attributes -sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize() { // not supported return false; } -void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ ) { // not supported } // private -sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::RuntimeException) +sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const { for( sal_Int32 nIndex = 0, nCount = mxFormIC->getCount(); nIndex < nCount; ++nIndex ) { @@ -418,34 +418,34 @@ ScVbaButton::ScVbaButton( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< container::XIndexContainer >& rxFormIC, - const uno::Reference< drawing::XControlShape >& rxControlShape ) throw (uno::RuntimeException) : + const uno::Reference< drawing::XControlShape >& rxControlShape ) : ScVbaButton_BASE( rxParent, rxContext, rxModel, rxFormIC, rxControlShape, LISTENER_ACTION ) { } // XButton attributes -OUString SAL_CALL ScVbaButton::getCaption() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButton::getCaption() { return mxControlProps->getPropertyValue( "Label" ).get< OUString >(); } -void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) { mxControlProps->setPropertyValue( "Label", uno::Any( rCaption ) ); } -uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() { return new ScVbaFont( this, mxContext, maPalette, mxControlProps, nullptr, true ); } -void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) { // TODO } -sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() { switch( mxControlProps->getPropertyValue( "Align" ).get< sal_Int16 >() ) { @@ -456,7 +456,7 @@ sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeExce return excel::Constants::xlCenter; } -void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) { sal_Int32 nAwtAlign = awt::TextAlign::CENTER; switch( nAlign ) @@ -469,7 +469,7 @@ void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno mxControlProps->setPropertyValue( "Align", uno::Any( static_cast< sal_Int16 >( nAwtAlign ) ) ); } -sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() { switch( mxControlProps->getPropertyValue( "VerticalAlign" ).get< style::VerticalAlignment >() ) { @@ -481,7 +481,7 @@ sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeExcept return excel::Constants::xlCenter; } -void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) { style::VerticalAlignment eAwtAlign = style::VerticalAlignment_MIDDLE; switch( nAlign ) @@ -493,20 +493,20 @@ void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno:: mxControlProps->setPropertyValue( "VerticalAlign", uno::Any( eAwtAlign ) ); } -sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getOrientation() { // not supported return excel::XlOrientation::xlHorizontal; } -void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) { // not supported } // XButton methods -uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength ) throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength ) { return new ScVbaButtonCharacters( this, mxContext, mxControlProps, maPalette, rStart, rLength ); } @@ -522,7 +522,7 @@ OUString ScVbaButton::implGetBaseName() const return OUString( "Button" ); } -void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) +void ScVbaButton::implSetDefaultProperties() { setCaption( getName() ); } diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 5c1a7200d44f..721bcf99a243 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -45,30 +45,30 @@ public: const css::uno::Reference< css::beans::XPropertySet >& rxPropSet, const ScVbaPalette& rPalette, const css::uno::Any& rStart, - const css::uno::Any& rLength ) throw (css::uno::RuntimeException); + const css::uno::Any& rLength ); virtual ~ScVbaButtonCharacters() override; // XCharacters attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& rCaption ) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& rText ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override; // XCharacters methods - virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Insert( const OUString& rString ) override; + virtual void SAL_CALL Delete() override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE private: /// @throws css::uno::RuntimeException - OUString getFullString() const throw (css::uno::RuntimeException); + OUString getFullString() const; /// @throws css::uno::RuntimeException - void setFullString( const OUString& rString ) throw (css::uno::RuntimeException); + void setFullString( const OUString& rString ); private: ScVbaPalette maPalette; @@ -88,29 +88,29 @@ public: const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, - const css::uno::Reference< css::drawing::XShape >& rxShape ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::drawing::XShape >& rxShape ); // XSheetObject attributes - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( double fLeft ) override; + virtual double SAL_CALL getTop() override; + virtual void SAL_CALL setTop( double fTop ) override; + virtual double SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( double fWidth ) override; + virtual double SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( double fHeight ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual sal_Int32 SAL_CALL getPlacement() override; + virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) override; + virtual sal_Bool SAL_CALL getPrintObject() override; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override; /** Sets default properties after a new object has been created. @throws css::uno::RuntimeException */ - void setDefaultProperties( sal_Int32 nIndex ) throw (css::uno::RuntimeException); + void setDefaultProperties( sal_Int32 nIndex ); protected: /** Derived classes return the base name used for new objects. */ @@ -119,7 +119,7 @@ protected: @throws css::uno::RuntimeException */ - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); + virtual void implSetDefaultProperties(); protected: ScVbaPalette maPalette; @@ -150,23 +150,23 @@ public: const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::container::XIndexContainer >& rxFormIC, const css::uno::Reference< css::drawing::XControlShape >& rxControlShape, - ListenerType eListenerType ) throw (css::uno::RuntimeException); + ListenerType eListenerType ); // XSheetObject attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual OUString SAL_CALL getOnAction() override; + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) override; + virtual sal_Bool SAL_CALL getPrintObject() override; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override; // XControlObject attributes - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoSize() override; + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override; protected: /// @throws css::uno::RuntimeException - sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException); + sal_Int32 getModelIndexInForm() const; protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; @@ -186,30 +186,30 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::container::XIndexContainer >& rxFormIC, - const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ); // XButton attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& rCaption ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override; + virtual sal_Int32 SAL_CALL getHorizontalAlignment() override; + virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) override; + virtual sal_Int32 SAL_CALL getVerticalAlignment() override; + virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) override; + virtual sal_Int32 SAL_CALL getOrientation() override; + virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) override; // XButton methods css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters( - const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rStart, const css::uno::Any& rLength ) override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE protected: virtual OUString implGetBaseName() const override; - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) override; + virtual void implSetDefaultProperties() override; }; #endif diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 2ac40eb50176..ab8c102ced38 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -57,7 +57,7 @@ inline bool lclGetProperty( Type& orValue, const uno::Reference< beans::XPropert @throws uno::RuntimeException */ -inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeException) +inline double lclPointsToHmm( const uno::Any& rPoints ) { return PointsToHmm( ::rtl::math::approxFloor( rPoints.get< double >() / 0.75 ) * 0.75 ); } @@ -80,7 +80,7 @@ public: const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, - const uno::Type& rVbaType ) throw (uno::RuntimeException); + const uno::Type& rVbaType ); /** Returns the VBA helper interface of the VBA collection object. */ inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; } @@ -94,40 +94,40 @@ public: @throws uno::RuntimeException */ - void collectShapes() throw (uno::RuntimeException); + void collectShapes(); /** Creates and returns a new UNO shape. @throws uno::RuntimeException */ - uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException); + uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize ); /** Inserts the passed shape into the draw page and into this container, and returns its index in the draw page. @throws uno::RuntimeException */ - sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape ); /** Creates and returns a new VBA implementation object for the passed shape. @throws uno::RuntimeException */ - ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape ); /** Creates and returns a new VBA implementation object for the passed shape in an Any. @throws uno::RuntimeException */ - uno::Any createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException); + uno::Any createCollectionObject( const uno::Any& rSource ); /** Returns the VBA implementation object with the specified name. @throws uno::RuntimeException */ - uno::Any getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException); + uno::Any getItemByStringIndex( const OUString& rIndex ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; protected: /** Derived classes return true, if the passed shape is supported by the instance. */ @@ -136,7 +136,7 @@ protected: @throws uno::RuntimeException */ - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) = 0; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) = 0; /** Derived classes return the service name of the UNO shape. */ virtual OUString implGetShapeServiceName() const = 0; @@ -144,12 +144,12 @@ protected: @throws uno::RuntimeException */ - virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException); + virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const; /** Is called when a new UNO shape has been created but not yet inserted into the drawing page. @throws uno::RuntimeException */ - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ); protected: uno::Reference< XHelperInterface > mxParent; @@ -169,7 +169,7 @@ ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, - const uno::Type& rVbaType ) throw (uno::RuntimeException) : + const uno::Type& rVbaType ) : mxParent( rxParent ), mxContext( rxContext ), mxModel( rxModel, uno::UNO_SET_THROW ), @@ -180,7 +180,7 @@ ScVbaObjectContainer::ScVbaObjectContainer( mxShapes.set( xDrawPageSupp->getDrawPage(), uno::UNO_QUERY_THROW ); } -void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException) +void ScVbaObjectContainer::collectShapes() { maShapes.clear(); for( sal_Int32 nIndex = 0, nCount = mxShapes->getCount(); nIndex < nCount; ++nIndex ) @@ -191,7 +191,7 @@ void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException) } } -uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException) +uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize ) { uno::Reference< drawing::XShape > xShape( mxFactory->createInstance( implGetShapeServiceName() ), uno::UNO_QUERY_THROW ); xShape->setPosition( rPos ); @@ -200,7 +200,7 @@ uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt:: return xShape; } -sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape ) { mxShapes->add( rxShape ); maShapes.push_back( rxShape ); @@ -208,19 +208,19 @@ sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XSha } ::rtl::Reference< ScVbaSheetObjectBase > ScVbaObjectContainer::createVbaObject( - const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) + const uno::Reference< drawing::XShape >& rxShape ) { return implCreateVbaObject( rxShape ); } -uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException) +uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource ) { uno::Reference< drawing::XShape > xShape( rSource, uno::UNO_QUERY_THROW ); uno::Reference< excel::XSheetObject > xSheetObject( implCreateVbaObject( xShape ) ); return uno::Any( xSheetObject ); } -uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException) +uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) { for( ShapeVector::iterator aIt = maShapes.begin(), aEnd = maShapes.end(); aIt != aEnd; ++aIt ) if( rIndex == implGetShapeName( *aIt ) ) @@ -230,13 +230,12 @@ uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) th // XIndexAccess -sal_Int32 SAL_CALL ScVbaObjectContainer::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaObjectContainer::getCount() { return static_cast< sal_Int32 >( maShapes.size() ); } uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( (0 <= nIndex) && (nIndex < getCount()) ) return uno::Any( maShapes[ static_cast< size_t >( nIndex ) ] ); @@ -245,25 +244,25 @@ uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex ) // XElementAccess -uno::Type SAL_CALL ScVbaObjectContainer::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScVbaObjectContainer::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() { return !maShapes.empty(); } // private -OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) +OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const { uno::Reference< beans::XPropertySet > xPropSet( rxShape, uno::UNO_QUERY_THROW ); return xPropSet->getPropertyValue( "Name" ).get< OUString >(); } -void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) throw (uno::RuntimeException) +void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) { } @@ -288,7 +287,7 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : +ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) { @@ -299,21 +298,21 @@ ScVbaSheetObjectsBase::~ScVbaSheetObjectsBase() { } -void ScVbaSheetObjectsBase::collectShapes() throw (uno::RuntimeException) +void ScVbaSheetObjectsBase::collectShapes() { mxContainer->collectShapes(); } // XEnumerationAccess -uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration() throw (uno::RuntimeException) +uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration() { return new ScVbaObjectEnumeration( mxContainer ); } // XElementAccess -uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType() throw (uno::RuntimeException) +uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType() { return mxContainer->getVbaType(); } @@ -325,21 +324,21 @@ uno::Any ScVbaSheetObjectsBase::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException) +uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) { return mxContainer->getItemByStringIndex( rIndex ); } // Graphic object containers supporting ooo.vba.excel.XGraphicObject -ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : +ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) : ScVbaGraphicObjects_BASE( rxContainer ) { } // XGraphicObjects -uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight ) { /* Extract double values from passed Anys (the lclPointsToHmm() helper function will throw a RuntimeException on any error), and convert from @@ -372,17 +371,17 @@ public: const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName ) throw (uno::RuntimeException); + const OUString& rModelServiceName ); protected: /// @throws uno::RuntimeException - uno::Reference< container::XIndexContainer > const & createForm() throw (uno::RuntimeException); + uno::Reference< container::XIndexContainer > const & createForm(); virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const override; virtual OUString implGetShapeServiceName() const override; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; - virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) override; - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override; + virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const override; + virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) override; protected: uno::Reference< container::XIndexContainer > mxFormIC; @@ -395,13 +394,13 @@ ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName ) throw (uno::RuntimeException) : + const OUString& rModelServiceName ) : ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ), maModelServiceName( rModelServiceName ) { } -uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() throw (uno::RuntimeException) +uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() { if( !mxFormIC.is() ) { @@ -448,13 +447,13 @@ bool ScVbaControlContainer::implCheckProperties( const uno::Reference< beans::XP return true; } -OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) +OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const { uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); return uno::Reference< container::XNamed >( xControlShape->getControl(), uno::UNO_QUERY_THROW )->getName(); } -void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) { // passed shape must be a control shape uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); @@ -479,10 +478,10 @@ public: const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException); + const uno::Reference< sheet::XSpreadsheet >& rxSheet ); protected: - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) override; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const override; }; @@ -490,7 +489,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XSpreadsheet >& rxSheet ) : ScVbaControlContainer( rxParent, rxContext, rxModel, rxSheet, cppu::UnoType<excel::XButton>::get(), @@ -498,7 +497,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( { } -ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) { uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); return new ScVbaButton( mxParent, mxContext, mxModel, createForm(), xControlShape ); @@ -515,7 +514,7 @@ ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XSpreadsheet >& rxSheet ) : ScVbaGraphicObjectsBase( new ScVbaButtonContainer( rxParent, rxContext, rxModel, rxSheet ) ) { } diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index b0fc53521d7b..ca9872e4f9f4 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -43,24 +43,24 @@ class ScVbaSheetObjectsBase : public ScVbaSheetObjects_BASE { public: /// @throws css::uno::RuntimeException - explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException); + explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ); virtual ~ScVbaSheetObjectsBase() override; /** Updates the collection by fetching all shapes from the draw page. @throws css::uno::RuntimeException */ - void collectShapes() throw (css::uno::RuntimeException); + void collectShapes(); // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; - virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) override; protected: ScVbaObjectContainerRef mxContainer; @@ -75,14 +75,14 @@ class ScVbaGraphicObjectsBase : public ScVbaGraphicObjects_BASE { public: /// @throws css::uno::RuntimeException - explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException); + explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ); // XGraphicObjects virtual css::uno::Any SAL_CALL Add( const css::uno::Any& rLeft, const css::uno::Any& rTop, const css::uno::Any& rWidth, - const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rHeight ) override; }; /** Collection containing all button controls from a sheet (not ActiveX controls). */ @@ -94,7 +94,7 @@ public: const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, - const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet ); VBAHELPER_DECL_XHELPERINTERFACE }; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 243a49a687d4..4c82b44629c7 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; static const char DISPLAYNAME[] = "DisplayName"; uno::Reference< container::XNameAccess > -ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) +ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName("CellStyles"), uno::UNO_QUERY_THROW ); @@ -37,14 +37,14 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode /// @throws script::BasicErrorException /// @throws uno::RuntimeException static uno::Reference< beans::XPropertySet > -lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) +lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) { uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); return xStyleProps; } -void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException ) +void ScVbaStyle::initialise() { if (!mxModel.is() ) DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, "XModel Interface could not be retrieved" ); @@ -63,7 +63,6 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) - throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ) { try @@ -80,7 +79,6 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) - throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ) { try @@ -94,25 +92,25 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, } sal_Bool SAL_CALL -ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::BuiltIn() { return !mxStyle->isUserDefined(); } void SAL_CALL -ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::setName( const OUString& Name ) { mxStyle->setName(Name); } OUString SAL_CALL -ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::getName() { return mxStyle->getName(); } void SAL_CALL -ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::setNameLocal( const OUString& NameLocal ) { try { @@ -125,7 +123,7 @@ ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorE } OUString SAL_CALL -ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::getNameLocal() { OUString sName; try @@ -140,7 +138,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep } void SAL_CALL -ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::Delete() { try { @@ -153,13 +151,13 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException, } void SAL_CALL -ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } uno::Any SAL_CALL -ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::getMergeCells( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return uno::Any(); diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index fd8521ccb618..c21a55f6638d 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,27 +35,27 @@ protected: css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + void initialise(); public: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); + static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; }; // XStyle Methods - virtual sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL BuiltIn() override; + virtual void SAL_CALL setName( const OUString& Name ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) override; + virtual OUString SAL_CALL getNameLocal() override; + virtual void SAL_CALL Delete() override; // XFormat - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) override; + virtual css::uno::Any SAL_CALL getMergeCells( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index a4a1457882b7..2b8da076c2ba 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -33,7 +33,7 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc return uno::makeAny( xStyle ); } -ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) +ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) { try { @@ -47,7 +47,7 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con } uno::Sequence< OUString > -ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) +ScVbaStyles::getStyleNames() { return mxNameContainerCellStyles->getElementNames(); } @@ -59,7 +59,7 @@ ScVbaStyles::createCollectionObject(const uno::Any& aObject) } uno::Type SAL_CALL -ScVbaStyles::getElementType() throw (uno::RuntimeException) +ScVbaStyles::getElementType() { return cppu::UnoType<excel::XStyle>::get(); } @@ -76,11 +76,11 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<frame::XModel >& xModel ) : m_xIndexAccess( xIndexAccess ), m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { try { @@ -113,13 +113,13 @@ public: } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaStyles::createEnumeration() throw (uno::RuntimeException) +ScVbaStyles::createEnumeration() { return new EnumWrapper( m_xIndexAccess, mxParent, mxContext, mxModel ); } uno::Reference< excel::XStyle > SAL_CALL -ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) { uno::Reference< excel::XStyle > aRet; try @@ -166,7 +166,7 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr } void -ScVbaStyles::Delete(const OUString& _sStyleName) throw ( script::BasicErrorException ) +ScVbaStyles::Delete(const OUString& _sStyleName) { try { diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index d724492eef00..82f60d3a8cda 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -34,16 +34,16 @@ class ScVbaStyles: public ScVbaStyles_BASE css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles; public: /// @throws css::script::BasicErrorException - ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); + ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); + css::uno::Sequence< OUString > getStyleNames(); /// @throws css::script::BasicErrorException - void Delete(const OUString& _sStyleName) throw ( css::script::BasicErrorException ); + void Delete(const OUString& _sStyleName); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index f0e84e716ed1..1e141f4ffab0 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -31,19 +31,19 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte } OUString SAL_CALL -ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException, std::exception) +ScVbaTextBoxShape::getText() { return m_xTextRange->getString(); } void SAL_CALL -ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) +ScVbaTextBoxShape::setText( const OUString& _text ) { m_xTextRange->setString( _text ); } uno::Reference< excel::XCharacters > SAL_CALL -ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception) +ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) { ScDocShell* pDocShell = excel::getDocShell( m_xModel ); ScDocument* pDoc = pDocShell ? &pDocShell->GetDocument() : nullptr; diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 2e762429ac76..3c71ee87032c 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -34,9 +34,9 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& _text ) override; + virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 3c270d175219..c6aa6dd328c5 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -27,13 +27,13 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) : ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) ) +ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) ) { } // Methods uno::Any SAL_CALL -ScVbaTextFrame::Characters() throw (uno::RuntimeException, std::exception) +ScVbaTextFrame::Characters() { uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( SfxObjectShell::Current() ); diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index ff223c822144..9bac1c531e81 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -30,9 +30,9 @@ class ScVbaTextFrame : public ScVbaTextFrame_BASE { public: /// @throws css::lang::IllegalArgumentException - ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException ); + ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ); // Methods - virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Characters( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index fa85c2de0712..a4da150287c7 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -47,7 +47,7 @@ public: xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW ); oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) ); } - css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) SAL_OVERRIDE { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment @@ -55,14 +55,14 @@ public: // otherwise attempts to access the palette will fail return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet ); } - css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) SAL_OVERRIDE { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setText( const OUString& Text ) SAL_OVERRIDE { try { @@ -73,7 +73,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() ); } } - OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + OUString SAL_CALL getText( ) SAL_OVERRIDE { OUString sText; try @@ -87,23 +87,23 @@ public: return sText; } - void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setTop( double Top ) SAL_OVERRIDE { oShapeHelper->setTop( Top ); } - double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + double SAL_CALL getTop( ) SAL_OVERRIDE { return oShapeHelper->getTop(); } - void SAL_CALL setLeft( double Left ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setLeft( double Left ) SAL_OVERRIDE { oShapeHelper->setLeft( Left ); } - double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + double SAL_CALL getLeft( ) SAL_OVERRIDE { return oShapeHelper->getLeft(); } - void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) SAL_OVERRIDE { try { @@ -114,7 +114,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() ); } } - ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + ::sal_Int32 SAL_CALL getOrientation( ) SAL_OVERRIDE { sal_Int32 nSOOrientation = 0; try diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 82fbcdf3e224..e2e75009a35d 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -52,7 +52,7 @@ lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange ) } sal_Bool SAL_CALL -ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getIgnoreBlank() { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); bool bBlank = false; @@ -61,7 +61,7 @@ ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _ignoreblank ) ); @@ -69,7 +69,7 @@ ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInCellDropdown() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); sal_Int32 nShowList = 0; @@ -78,7 +78,7 @@ ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exceptio } void SAL_CALL -ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) { sal_Int32 nDropDown = 0; if ( _incelldropdown ) @@ -89,7 +89,7 @@ ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) throw (uno::Run } sal_Bool SAL_CALL -ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getShowInput() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); bool bShowInput = false; @@ -98,7 +98,7 @@ ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeException, std::exception) +ScVbaValidation:: setShowInput( sal_Bool _showinput ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) ); xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _showinput ) ); @@ -106,7 +106,7 @@ ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getShowError() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); bool bShowError = false; @@ -115,7 +115,7 @@ ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setShowError( sal_Bool _showerror ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_SHOWERR, uno::makeAny( _showerror ) ); @@ -123,7 +123,7 @@ ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeExceptio } OUString SAL_CALL -ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getErrorTitle() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sErrorTitle; @@ -132,7 +132,7 @@ ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception) } void -ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setErrorTitle( const OUString& _errormessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_ERRTITLE, uno::makeAny( _errormessage ) ); @@ -140,7 +140,7 @@ ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::Runt } OUString SAL_CALL -ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInputMessage() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sMsg; @@ -149,7 +149,7 @@ ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInputMessage( const OUString& _inputmessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_INPMESS, uno::makeAny( _inputmessage ) ); @@ -157,7 +157,7 @@ ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::Ru } OUString SAL_CALL -ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInputTitle() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sString; @@ -166,7 +166,7 @@ ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInputTitle( const OUString& _inputtitle ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_INPTITLE, uno::makeAny( _inputtitle ) ); @@ -174,7 +174,7 @@ ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::Runtim } OUString SAL_CALL -ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getErrorMessage() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sString; @@ -183,7 +183,7 @@ ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setErrorMessage( const OUString& _errormessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_ERRMESS, uno::makeAny( _errormessage ) ); @@ -191,7 +191,7 @@ ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::Ru } void SAL_CALL -ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::Delete( ) { OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); @@ -212,7 +212,7 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) // Fix the defect that validatation cannot work when the input should be limited between a lower bound and an upper bound void SAL_CALL -ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); @@ -294,7 +294,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un } OUString SAL_CALL -ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getFormula1() { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); OUString sString = xCond->getFormula1(); @@ -315,14 +315,14 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -ScVbaValidation::getFormula2() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getFormula2() { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); return xCond->getFormula2(); } sal_Int32 SAL_CALL -ScVbaValidation::getType() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getType() { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); sheet::ValidationType nValType = sheet::ValidationType_ANY; diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 14e7c430f2d8..b253386dfdca 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -32,28 +32,28 @@ class ScVbaValidation : public ValidationImpl_BASE public: ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {} // Attributes - virtual sal_Bool SAL_CALL getIgnoreBlank() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowInput( sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowError( sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIgnoreBlank() override; + virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) override; + virtual sal_Bool SAL_CALL getInCellDropdown() override; + virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) override; + virtual sal_Bool SAL_CALL getShowInput() override; + virtual void SAL_CALL setShowInput( sal_Bool _showinput ) override; + virtual sal_Bool SAL_CALL getShowError() override; + virtual void SAL_CALL setShowError( sal_Bool _showerror ) override; + virtual OUString SAL_CALL getInputTitle() override; + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) override; + virtual OUString SAL_CALL getErrorTitle() override; + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) override; + virtual OUString SAL_CALL getInputMessage() override; + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) override; + virtual OUString SAL_CALL getErrorMessage() override; + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) override; + virtual OUString SAL_CALL getFormula1() override ; + virtual OUString SAL_CALL getFormula2() override; + virtual sal_Int32 SAL_CALL getType() override; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 2a7ef9c729d9..fae68abba1b3 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -70,16 +70,16 @@ public: Sheets::const_iterator m_it; /// @throws uno::RuntimeException - SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel ) + SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) : m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel ) { m_it = m_sheets.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return m_it != m_sheets.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) { @@ -128,16 +128,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new SelectedSheetsEnum( m_xContext, sheets, m_xModel ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return sheets.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) @@ -147,18 +147,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<excel::XWorksheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !sheets.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -167,12 +167,12 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return comphelper::mapKeysToSequence( namesToIndices ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -184,7 +184,7 @@ ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException) : + const uno::Reference< frame::XController >& xController ) : WindowImpl_BASE( xParent, xContext, xModel, xController ) { init(); @@ -192,7 +192,7 @@ ScVbaWindow::ScVbaWindow( ScVbaWindow::ScVbaWindow( const uno::Sequence< uno::Any >& args, - const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& xContext ) : WindowImpl_BASE( args, xContext ) { init(); @@ -219,25 +219,25 @@ ScVbaWindow::init() } uno::Reference< beans::XPropertySet > -ScVbaWindow::getControllerProps() throw (uno::RuntimeException) +ScVbaWindow::getControllerProps() { return uno::Reference< beans::XPropertySet >( getController(), uno::UNO_QUERY_THROW ); } uno::Reference< beans::XPropertySet > -ScVbaWindow::getFrameProps() throw (uno::RuntimeException) +ScVbaWindow::getFrameProps() { return uno::Reference< beans::XPropertySet >( getController()->getFrame(), uno::UNO_QUERY_THROW ); } uno::Reference< awt::XDevice > -ScVbaWindow::getDevice() throw (uno::RuntimeException) +ScVbaWindow::getDevice() { return uno::Reference< awt::XDevice >( getWindow(), uno::UNO_QUERY_THROW ); } void -ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll ) throw (uno::RuntimeException) +ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll ) { if( !m_xPane.is() ) throw uno::RuntimeException(); @@ -248,19 +248,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, std::exception) +ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { Scroll( Down, Up, ToRight, ToLeft, false ); } void SAL_CALL -ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { Scroll( Down, Up, ToRight, ToLeft, true ); } uno::Any SAL_CALL -ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) { uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) ); // #FIXME needs a workbook as a parent @@ -274,7 +274,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, std::exception) +ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) { // #TODO #FIXME need some implementation to scroll through the tabs // but where is this done? @@ -294,7 +294,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P } uno::Any SAL_CALL -ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getCaption() { static const char sCrud[] = " - OpenOffice.org Calc"; static const sal_Int32 nCrudLen = strlen(sCrud); @@ -333,13 +333,13 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setCaption( const uno::Any& _caption ) { getFrameProps()->setPropertyValue( SC_UNONAME_TITLE, _caption ); } uno::Any SAL_CALL -ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getScrollRow() { sal_Int32 nValue = 0; // !! TODO !! get view shell from controller @@ -354,7 +354,7 @@ ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) { // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -369,7 +369,7 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep } uno::Any SAL_CALL -ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getScrollColumn() { sal_Int32 nValue = 0; // !! TODO !! get view shell from controller @@ -384,7 +384,7 @@ ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) { // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -399,7 +399,7 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim } uno::Any SAL_CALL -ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getWindowState() { sal_Int32 nwindowState = xlNormal; // !! TODO !! get view shell from controller @@ -417,7 +417,7 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setWindowState( const uno::Any& _windowstate ) { sal_Int32 nwindowState = xlMaximized; _windowstate >>= nwindowState; @@ -439,7 +439,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE } void -ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) +ScVbaWindow::Activate() { rtl::Reference<ScVbaWorkbook> workbook( new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ) ); @@ -447,35 +447,35 @@ ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) } void -ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) { rtl::Reference< ScVbaWorkbook > workbook( new ScVbaWorkbook( 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, std::exception) +ScVbaWindow::ActivePane() { 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, std::exception) +ScVbaWindow::ActiveCell( ) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getActiveCell(); } uno::Any SAL_CALL -ScVbaWindow::Selection( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::Selection( ) { 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, std::exception) +ScVbaWindow::RangeSelection() { /* TODO / FIXME: According to documentation, this method returns the range selection even if shapes are selected. */ @@ -483,7 +483,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx } sal_Bool SAL_CALL -ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayGridlines() { OUString sName( SC_UNO_SHOWGRID ); bool bGrid = true; @@ -492,14 +492,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) { OUString sName( SC_UNO_SHOWGRID ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayHeadings() { OUString sName( SC_UNO_COLROWHDR ); bool bHeading = true; @@ -508,14 +508,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings ) { OUString sName( SC_UNO_COLROWHDR ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayHorizontalScrollBar() { OUString sName( SC_UNO_HORSCROLL ); bool bHorizontalScrollBar = true; @@ -524,14 +524,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std:: } void SAL_CALL -ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) { OUString sName( SC_UNO_HORSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayOutline() { OUString sName( SC_UNO_OUTLSYMB ); bool bOutline = true; @@ -540,14 +540,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline ) { OUString sName( SC_UNO_OUTLSYMB ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayVerticalScrollBar() { OUString sName( SC_UNO_VERTSCROLL ); bool bVerticalScrollBar = true; @@ -556,14 +556,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::ex } void SAL_CALL -ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) { OUString sName( SC_UNO_VERTSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayWorkbookTabs() { OUString sName( SC_UNO_SHEETTABS ); bool bWorkbookTabs = true; @@ -572,21 +572,21 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::excepti } void SAL_CALL -ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) { OUString sName( SC_UNO_SHEETTABS ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } sal_Bool SAL_CALL -ScVbaWindow::getFreezePanes() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getFreezePanes() { uno::Reference< sheet::XViewFreezable > xViewFreezable( getController(), uno::UNO_QUERY_THROW ); return xViewFreezable->hasFrozenPanes(); } void SAL_CALL -ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) { uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XViewSplitable > xViewSplitable( xViewPane, uno::UNO_QUERY_THROW ); @@ -617,14 +617,14 @@ ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaWindow::getSplit() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplit() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getIsWindowSplit(); } void SAL_CALL -ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplit( sal_Bool _bSplit ) { if( !_bSplit ) { @@ -642,14 +642,14 @@ ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exc } sal_Int32 SAL_CALL -ScVbaWindow::getSplitColumn() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitColumn() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getSplitColumn(); } void SAL_CALL -ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) { if( getSplitColumn() != _splitcolumn ) { @@ -660,14 +660,14 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti } double SAL_CALL -ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitHorizontal() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return PixelsToPoints( getDevice(), xViewSplitable->getSplitHorizontal(), true ); } void SAL_CALL -ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitHorizontal( double _splithorizontal ) { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); double fHoriPixels = PointsToPixels( getDevice(), _splithorizontal, true ); @@ -675,14 +675,14 @@ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeEx } sal_Int32 SAL_CALL -ScVbaWindow::getSplitRow() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitRow() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getSplitRow(); } void SAL_CALL -ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) { if( getSplitRow() != _splitrow ) { @@ -693,14 +693,14 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, st } double SAL_CALL -ScVbaWindow::getSplitVertical() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitVertical() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return PixelsToPoints( getDevice(), xViewSplitable->getSplitVertical(), false ); } void SAL_CALL -ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitVertical(double _splitvertical ) { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); double fVertiPixels = PointsToPixels( getDevice(), _splitvertical, false ); @@ -734,7 +734,7 @@ void ScVbaWindow::SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows ) } uno::Any SAL_CALL -ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getZoom() { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); OUString sName( SC_UNO_ZOOMTYPE ); @@ -755,7 +755,6 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception) } void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom) - throw (uno::RuntimeException, std::exception) { sal_Int16 nZoom = 100; _zoom >>= nZoom; @@ -770,14 +769,14 @@ void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom) } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::ActiveSheet( ) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getActiveSheet(); } uno::Any SAL_CALL -ScVbaWindow::getView() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getView() { bool bPageBreak = false; sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; @@ -795,7 +794,7 @@ ScVbaWindow::getView() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setView( const uno::Any& _view) { sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; _view >>= nWindowView; @@ -818,7 +817,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std:: } uno::Reference< excel::XRange > SAL_CALL -ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getVisibleRange() { uno::Reference< container::XIndexAccess > xPanesIA( getController(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XViewPane > xTopLeftPane( xPanesIA->getByIndex( 0 ), uno::UNO_QUERY_THROW ); @@ -827,7 +826,7 @@ ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception) } sal_Int32 SAL_CALL -ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000); @@ -835,7 +834,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, std::exception) +ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000); @@ -843,7 +842,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, std::exception) +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 ) { // need test, print current active sheet // !! TODO !! get view shell from controller @@ -851,14 +850,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, std::exception) +ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) { // 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, std::exception) +double SAL_CALL ScVbaWindow::getTabRatio() { ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell && pViewShell->GetViewData().GetView() ) @@ -870,7 +869,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, st return 0.0; } -void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) { ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell && pViewShell->GetViewData().GetView() ) diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 3cdfe56e9ee5..ee70854f6c79 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -42,18 +42,18 @@ private: void init(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getControllerProps() throw (css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySet > getControllerProps(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getFrameProps() throw (css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySet > getFrameProps(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::awt::XDevice > getDevice() throw (css::uno::RuntimeException); + css::uno::Reference< css::awt::XDevice > getDevice(); protected: void SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows ); public: /// @throws css::uno::RuntimeException - void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ) throw (css::uno::RuntimeException); + void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ); public: /// @throws css::uno::RuntimeException @@ -61,71 +61,69 @@ public: const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XController >& xController ); /// @throws css::uno::RuntimeException ScVbaWindow( const css::uno::Sequence< css::uno::Any >& aArgs, - const css::uno::Reference< css::uno::XComponentContext >& xContext ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); // XWindow - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSplit( sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) override ; - virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) override ; - virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) override; + virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) override; + virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) override; + virtual css::uno::Any SAL_CALL getCaption() override; + virtual sal_Bool SAL_CALL getDisplayGridlines() override; + virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) override; + virtual sal_Bool SAL_CALL getDisplayHeadings() override; + virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) override; + virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() override; + virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) override; + virtual sal_Bool SAL_CALL getDisplayOutline() override; + virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) override; + virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() override; + virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) override; + virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() override; + virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) override; + virtual sal_Bool SAL_CALL getFreezePanes() override; + virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) override; + virtual sal_Bool SAL_CALL getSplit() override; + virtual void SAL_CALL setSplit( sal_Bool _bSplit ) override; + virtual sal_Int32 SAL_CALL getSplitColumn() override ; + virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) override ; + virtual double SAL_CALL getSplitHorizontal() override ; + virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) override ; + virtual sal_Int32 SAL_CALL getSplitRow() override ; + virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) override ; + virtual double SAL_CALL getSplitVertical() override ; + virtual void SAL_CALL setSplitVertical( double _splitvertical ) override ; + virtual css::uno::Any SAL_CALL getScrollRow() override ; + virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) override ; + virtual css::uno::Any SAL_CALL getScrollColumn() override ; + virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) override ; + virtual css::uno::Any SAL_CALL getView() override; + virtual void SAL_CALL setView( const css::uno::Any& _view ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override; + virtual css::uno::Any SAL_CALL getWindowState() override; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) override; + virtual css::uno::Any SAL_CALL getZoom() override; + virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) override; + virtual double SAL_CALL getTabRatio() override ; + virtual void SAL_CALL setTabRatio( double _tabratio ) override ; // Methods - virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL 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) override; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) override; + virtual void SAL_CALL Activate( ) override; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) override; + virtual css::uno::Any SAL_CALL Selection( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() override; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) override; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) override; + virtual void SAL_CALL 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 ) override; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index d7202344c12e..324df72297ee 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -60,13 +60,13 @@ protected: public: /// @throws uno::RuntimeException - WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) throw ( uno::RuntimeException ) : m_xContext( xContext ), m_components( components ) + WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) : m_xContext( xContext ), m_components( components ) { m_it = m_components.begin(); } /// @throws uno::RuntimeException - explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext ) + explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) : m_xContext( xContext ) { uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext); uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration(); @@ -79,12 +79,12 @@ public: m_it = m_components.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return m_it != m_components.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) { @@ -99,7 +99,7 @@ class WindowEnumImpl : public WindowComponentEnumImpl uno::Any m_aApplication; public: WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication ); } @@ -140,16 +140,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new WindowComponentEnumImpl( m_xContext, m_windows ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return m_windows.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || static_cast< Components::size_type >( Index ) >= m_windows.size() ) @@ -158,18 +158,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<sheet::XSpreadsheetDocument>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !m_windows.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -178,12 +178,12 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return comphelper::mapKeysToSequence( namesToIndices ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -195,7 +195,7 @@ ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParen { } uno::Reference< container::XEnumeration > -ScVbaWindows::createEnumeration() throw (uno::RuntimeException) +ScVbaWindows::createEnumeration() { return new WindowEnumImpl( mxContext, Application() ); } @@ -207,13 +207,13 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaWindows::getElementType() throw (uno::RuntimeException) +ScVbaWindows::getElementType() { return cppu::UnoType<excel::XWindows>::get(); } void SAL_CALL -ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) { //#TODO #FIXME see what can be done for an implementation here } diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 262287b2b778..3e9867db4006 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -34,11 +34,11 @@ public: ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XWindows - virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index a732f0f87858..3c2bdda52ccd 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -66,7 +66,7 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors ) } void SAL_CALL -ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) +ScVbaWorkbook::ResetColors( ) { uno::Reference< container::XIndexAccess > xIndexAccess( ScVbaPalette::getDefaultPalette(), uno::UNO_QUERY_THROW ); sal_Int32 nLen = xIndexAccess->getCount(); @@ -80,7 +80,7 @@ ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::Runt } ::uno::Any SAL_CALL -ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) +ScVbaWorkbook::Colors( const ::uno::Any& Index ) { uno::Any aRet; if ( Index.hasValue() ) @@ -137,7 +137,7 @@ bool ScVbaWorkbook::setFilterPropsFromFormat( sal_Int32 nFormat, uno::Sequence< } ::sal_Int32 SAL_CALL -ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException, std::exception) +ScVbaWorkbook::getFileFormat( ) { sal_Int32 aFileFormat = 0; OUString aFilterName; @@ -216,7 +216,7 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args, } uno::Reference< excel::XWorksheet > -ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::getActiveSheet() { uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -229,13 +229,13 @@ ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Sheets( const uno::Any& aIndex ) { return Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getModel() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW ); @@ -249,7 +249,7 @@ ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException return uno::Any( xWorkSheets->Item( aIndex, uno::Any() ) ); } uno::Any SAL_CALL -ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Windows( const uno::Any& aIndex ) { uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( getParent(), mxContext ) ); @@ -259,32 +259,32 @@ ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, s } void SAL_CALL -ScVbaWorkbook::Activate() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Activate() { VbaDocumentBase::Activate(); } void -ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException) +ScVbaWorkbook::Protect( const uno::Any &aPassword ) { VbaDocumentBase::Protect( aPassword ); } sal_Bool -ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::getProtectStructure() { uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW ); return xProt->isProtected(); } -sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); return rDoc.GetDocOptions().IsCalcAsShown(); } -void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); @@ -294,7 +294,7 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl } void -ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) { OUString aURL; osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); @@ -306,7 +306,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep } void SAL_CALL -ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) { OUString sFileName; FileName >>= sFileName; @@ -355,7 +355,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con } css::uno::Any SAL_CALL -ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWorkbook::Styles( const uno::Any& Item ) { // quick look and Styles object doesn't seem to have a valid parent // or a least the object browser just shows an object that has no @@ -367,7 +367,7 @@ ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorExcepti } uno::Any SAL_CALL -ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Names( const uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); @@ -397,14 +397,14 @@ ScVbaWorkbook::getServiceNames() } OUString SAL_CALL -ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException, std::exception) +ScVbaWorkbook::getCodeName() { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); return xModelProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int64 -ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 )) diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 647641e1d6e8..25c4b188017c 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -40,35 +40,35 @@ public: ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); // Attributes - virtual sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getProtectStructure() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() override; + virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) override; // Methods - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Activate() override; + virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) override; + virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) override; + virtual void SAL_CALL ResetColors( ) override; + virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) override; + virtual ::sal_Int32 SAL_CALL getFileFormat( ) override; + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) override; // code name - virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCodeName() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOK_HXX diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 0eb690c9fc18..c26088c42f1a 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -79,9 +79,9 @@ class WorkBookEnumImpl : public EnumerationHelperImpl { public: /// @throws uno::RuntimeException - WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} + WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getWorkbook( m_xContext, xDoc, m_xParent ); @@ -94,12 +94,12 @@ ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParen } // XEnumerationAccess uno::Type -ScVbaWorkbooks::getElementType() throw (uno::RuntimeException) +ScVbaWorkbooks::getElementType() { return cppu::UnoType<excel::XWorkbook>::get(); } uno::Reference< container::XEnumeration > -ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException) +ScVbaWorkbooks::createEnumeration() { // #FIXME its possible the WorkBookEnumImpl here doesn't reflect // the state of this object ( although it should ) would be @@ -117,7 +117,7 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource ) } uno::Any SAL_CALL -ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Add( const uno::Any& Template ) { uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc; sal_Int32 nWorkbookType = 0; @@ -161,7 +161,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, st } void SAL_CALL -ScVbaWorkbooks::Close() throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Close() { } @@ -200,7 +200,7 @@ ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) { // we need to detect if this is a URL, if not then assume it's a file path OUString aURL; diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index a30359be3c69..c9825d51e039 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -39,8 +39,8 @@ public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -48,9 +48,9 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() override; // XWorkbooks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) override; + virtual void SAL_CALL Close( ) override; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index ff021a8c8eec..30e9fdb3828b 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -181,12 +181,12 @@ openNewDoc(const OUString& aSheetName ) ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheet >& xSheet, - const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false ) + const uno::Reference< frame::XModel >& xModel ) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false ) { } ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) + uno::Reference< uno::XComponentContext> const & xContext ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) { if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); @@ -283,21 +283,21 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> const & xSheet } OUString -ScVbaWorksheet::getName() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getName() { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); return xNamed->getName(); } void -ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setName(const OUString &rName ) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); xNamed->setName( rName ); } sal_Int32 -ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getVisible() { uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW ); bool bVisible = false; @@ -307,7 +307,7 @@ ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception) } void -ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setVisible( sal_Int32 nVisible ) { using namespace ::ooo::vba::excel::XlSheetVisibility; bool bVisible = true; @@ -333,13 +333,13 @@ ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, s } sal_Int16 -ScVbaWorksheet::getIndex() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getIndex() { return getSheetID() + 1; } sal_Int32 -ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getEnableSelection() { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); SCTAB nTab = 0; @@ -366,7 +366,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exceptio } void -ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) { if( (nSelection != excel::XlEnableSelection::xlNoRestrictions) && (nSelection != excel::XlEnableSelection::xlUnlockedCells) && @@ -405,7 +405,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } -sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); @@ -415,7 +415,7 @@ sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeExcepti return false; } -void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocShell* pDocShell = excel::getDocShell( xModel ); @@ -441,7 +441,7 @@ void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) thro } uno::Reference< excel::XRange > -ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getUsedRange() { uno::Reference< sheet::XSheetCellRange > xSheetCellRange(getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor( getSheet()->createCursorByRange( xSheetCellRange ), uno::UNO_QUERY_THROW ); @@ -453,20 +453,20 @@ ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XOutline > -ScVbaWorksheet::Outline( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Outline( ) { uno::Reference<sheet::XSheetOutline> xOutline(getSheet(),uno::UNO_QUERY_THROW); return new ScVbaOutline( this, mxContext, xOutline); } uno::Reference< excel::XPageSetup > -ScVbaWorksheet::PageSetup( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PageSetup( ) { return new ScVbaPageSetup( this, mxContext, getSheet(), getModel() ); } uno::Any -ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) { uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak(getSheet(),uno::UNO_QUERY_THROW); uno::Reference< excel::XHPageBreaks > xHPageBreaks( new ScVbaHPageBreaks( this, mxContext, xSheetPageBreak)); @@ -476,7 +476,7 @@ ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti } uno::Any -ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) { uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) ); @@ -486,32 +486,32 @@ ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeExcept } sal_Int32 -ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getStandardWidth() { return STANDARDWIDTH ; } sal_Int32 -ScVbaWorksheet::getStandardHeight() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getStandardHeight() { return STANDARDHEIGHT; } sal_Bool -ScVbaWorksheet::getProtectionMode() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectionMode() { return false; } sal_Bool -ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectContents() { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); return xProtectable->isProtected(); } sal_Bool -ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectDrawingObjects() { SCTAB nTab = 0; OUString aSheetName = getName(); @@ -529,13 +529,13 @@ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::ex } sal_Bool -ScVbaWorksheet::getProtectScenarios() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectScenarios() { return false; } void -ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Activate() { uno::Reference< sheet::XSpreadsheetView > xSpreadsheet( getModel()->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -543,13 +543,13 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception) } void -ScVbaWorksheet::Select() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Select() { Activate(); } void -ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) { uno::Reference<excel::XWorksheet> xSheet; OUString aCurrSheetName = getName(); @@ -586,7 +586,7 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno } void -ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) { uno::Reference<excel::XWorksheet> xSheet; if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue())) @@ -600,7 +600,7 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno } void -ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) { // #TODO# #FIXME# Link is not used uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY ); @@ -610,7 +610,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) t } void -ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Delete() { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); OUString aSheetName = getName(); @@ -629,7 +629,7 @@ ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException) +ScVbaWorksheet::getSheetAtOffset(SCTAB offset) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); uno::Reference <sheet::XSpreadsheets> xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW ); @@ -645,19 +645,19 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException) } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getNext() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getNext() { return getSheetAtOffset(static_cast<SCTAB>(1)); } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getPrevious() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getPrevious() { return getSheetAtOffset(-1); } void -ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) { // #TODO# #FIXME# is there anything we can do with the unused param // can the implementation use anything else here @@ -668,7 +668,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje } void -ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Unprotect( const uno::Any& Password ) { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); OUString aPasswd; @@ -677,14 +677,14 @@ ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeExcepti } void -ScVbaWorksheet::Calculate() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Calculate() { uno::Reference <sheet::XCalculatable> xReCalculate(getModel(), uno::UNO_QUERY_THROW); xReCalculate->calculate(); } uno::Reference< excel::XRange > -ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) { uno::Reference< excel::XRange > xSheetRange( new ScVbaRange( this, mxContext , uno::Reference< table::XCellRange >( getSheet(), uno::UNO_QUERY_THROW ) ) ); @@ -692,7 +692,7 @@ ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw } void -ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) { // #TODO# #FIXME# unused params above, can we do anything with those OUString url = ".uno:SpellDialog"; @@ -701,7 +701,7 @@ ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::A } uno::Reference< excel::XRange > -ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException) +ScVbaWorksheet::getSheetRange() { uno::Reference< table::XCellRange > xRange( getSheet(),uno::UNO_QUERY_THROW ); return uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRange ) ); @@ -711,7 +711,6 @@ ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException) // the vbarange functionality here ... uno::Reference< excel::XRange > ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol ) - throw (uno::RuntimeException, std::exception) { // Performance optimization for often-called Cells method: // Use a common helper method instead of creating a new ScVbaRange object @@ -720,19 +719,19 @@ ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol ) } uno::Reference< excel::XRange > -ScVbaWorksheet::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Rows(const uno::Any& aIndex ) { return getSheetRange()->Rows( aIndex ); } uno::Reference< excel::XRange > -ScVbaWorksheet::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Columns( const uno::Any& aIndex ) { return getSheetRange()->Columns( aIndex ); } uno::Any SAL_CALL -ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ChartObjects( const uno::Any& Index ) { if ( !mxCharts.is() ) { @@ -753,7 +752,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PivotTables( const uno::Any& Index ) { uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet(); uno::Reference< sheet::XDataPilotTablesSupplier > xTables(xSheet, uno::UNO_QUERY_THROW ) ; @@ -766,7 +765,7 @@ ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Comments( const uno::Any& Index ) { uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet(); uno::Reference< sheet::XSheetAnnotationsSupplier > xAnnosSupp( xSheet, uno::UNO_QUERY_THROW ); @@ -779,7 +778,7 @@ ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) { /* The worksheet always returns the same Hyperlinks object. See vbahyperlinks.hxx for more details. */ @@ -791,7 +790,7 @@ ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Names( const css::uno::Any& aIndex ) { // fake sheet-local names by returning all global names // #163498# initialize Names object with correct parent (this worksheet) @@ -805,7 +804,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::OLEObjects( const uno::Any& Index ) { uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW ); @@ -819,7 +818,7 @@ ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException } uno::Any SAL_CALL -ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Shapes( const uno::Any& aIndex ) { uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW ); @@ -833,7 +832,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, s } uno::Any SAL_CALL -ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Buttons( const uno::Any& rIndex ) { if( !mxButtons.is() ) mxButtons.set( new ScVbaButtons( this, mxContext, mxModel, mxSheet ) ); @@ -845,55 +844,55 @@ ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException, } uno::Any SAL_CALL -ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } void SAL_CALL -ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ShowDataForm( ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel ); @@ -909,7 +908,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Evaluate( const OUString& Name ) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -919,24 +918,24 @@ ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, s } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getIntrospection( ) { return uno::Reference< beans::XIntrospectionAccess >(); } uno::Any SAL_CALL -ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) { throw uno::RuntimeException("Unsupported"); // unsupported operation } void SAL_CALL -ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) { setDefaultPropByIntrospection( getValue( aPropertyName ), aValue ); } uno::Any SAL_CALL -ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaWorksheet::getValue( const OUString& aPropertyName ) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); @@ -947,7 +946,7 @@ ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownP } sal_Bool SAL_CALL -ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) { return false; } @@ -976,7 +975,7 @@ ScVbaWorksheet::getFormControls() } sal_Bool SAL_CALL -ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::hasProperty( const OUString& aName ) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -1024,13 +1023,13 @@ ScVbaWorksheet::getServiceImplName() } void SAL_CALL -ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation ) { uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW); xCalculatable->enableAutomaticCalculation( bEnableCalculation); } sal_Bool SAL_CALL -ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWorksheet::getEnableCalculation( ) { uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW); return xCalculatable->isAutomaticCalculationEnabled(); @@ -1049,21 +1048,21 @@ ScVbaWorksheet::getServiceNames() } OUString SAL_CALL -ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException, std::exception) +ScVbaWorksheet::getCodeName() { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); return xSheetProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int16 -ScVbaWorksheet::getSheetID() throw (uno::RuntimeException) +ScVbaWorksheet::getSheetID() { uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxSheet, uno::UNO_QUERY_THROW ); // if ActiveSheet, mxSheet is null. return xAddressable->getRangeAddress().Sheet; } void SAL_CALL -ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) { sal_Int32 nTo = 0; sal_Int32 nFrom = 0; @@ -1086,7 +1085,7 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A } sal_Int64 SAL_CALL -ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) throw(uno::RuntimeException, std::exception) +ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) { if (rId.getLength() == 16 && 0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 )) diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 207b60355895..a1d8fa11f9ec 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -58,9 +58,9 @@ class ScVbaWorksheet : public WorksheetImpl_BASE bool mbVeryHidden; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XRange > getSheetRange(); css::uno::Reference< css::container::XNameAccess > getFormControls(); css::uno::Any getControlShape( const OUString& sName ); @@ -70,10 +70,10 @@ public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet, - const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException) ; + const css::uno::Reference< css::frame::XModel >& xModel ) ; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); virtual ~ScVbaWorksheet() override; @@ -86,88 +86,88 @@ public: css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> const & xSheet, bool bAfter); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString &rName ) override; + virtual sal_Int32 SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Int32 nVisible ) override; + virtual ::sal_Int32 SAL_CALL getStandardWidth() override; + virtual ::sal_Int32 SAL_CALL getStandardHeight() override; + virtual sal_Bool SAL_CALL getProtectionMode() override; + virtual sal_Bool SAL_CALL getProtectContents() override; + virtual sal_Bool SAL_CALL getProtectDrawingObjects() override; + virtual sal_Bool SAL_CALL getProtectScenarios() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() override ; + virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) override; + virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) override; + virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) override; + virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() override; + virtual sal_Int16 SAL_CALL getIndex() override; + virtual sal_Int32 SAL_CALL getEnableSelection() override; + virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) override; + virtual sal_Bool SAL_CALL getAutoFilterMode() override; + virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) override; // Methods - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL Calculate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Activate() override; + virtual void SAL_CALL Select() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) override ; + virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) override; + virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) override; + virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) override; + + virtual void SAL_CALL Calculate( ) override; + virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) override; // Hacks (?) - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; + virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) override; + + virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) override; + virtual sal_Bool SAL_CALL getEnableCalculation( ) override; + virtual void SAL_CALL ShowDataForm( ) override; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) override; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override; // CodeName - virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCodeName() override; /// @throws css::uno::RuntimeException - sal_Int16 getSheetID() throw (css::uno::RuntimeException); + sal_Int16 getSheetID(); - virtual void SAL_CALL 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, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL 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, const css::uno::Any& IgnorePrintAreas ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 0592ca1e0f77..e4accbffbab9 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -66,11 +66,11 @@ class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumera SheetMap::iterator mIt; public: explicit WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( mIt != mSheetMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -88,16 +88,16 @@ class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc public: explicit SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {} // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !mSheetMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !mSheetMap.empty() ); } // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { uno::Sequence< OUString > sNames( mSheetMap.size() ); OUString* pString = sNames.getArray(); @@ -111,7 +111,7 @@ public: } return sNames; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -125,8 +125,8 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return mSheetMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return mSheetMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -135,7 +135,7 @@ public: } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new WorkSheetsEnumeration( mSheetMap ); } @@ -146,9 +146,9 @@ class SheetsEnumeration : public EnumerationHelperImpl uno::Reference< frame::XModel > m_xModel; public: /// @throws uno::RuntimeException - SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} + SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); uno::Reference< XHelperInterface > xIf = excel::getUnoSheetModuleObj( xSheet ); @@ -177,13 +177,13 @@ ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xPar // XEnumerationAccess uno::Type -ScVbaWorksheets::getElementType() throw (uno::RuntimeException) +ScVbaWorksheets::getElementType() { return cppu::UnoType<excel::XWorksheet>::get(); } uno::Reference< container::XEnumeration > -ScVbaWorksheets::createEnumeration() throw (uno::RuntimeException) +ScVbaWorksheets::createEnumeration() { if ( !m_xSheets.is() ) { @@ -215,7 +215,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource ) // XWorksheets uno::Any ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, - const uno::Any& Count, const uno::Any& Type ) throw (uno::RuntimeException, std::exception) + const uno::Any& Count, const uno::Any& Type ) { if ( isSelectedSheets() ) return uno::Any(); // or should we throw? @@ -288,7 +288,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, } void -ScVbaWorksheets::Delete() throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::Delete() { // #TODO #INVESTIGATE // mmm this method could be trouble if the underlying @@ -309,7 +309,7 @@ ScVbaWorksheets::isSelectedSheets() } void SAL_CALL -ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) { sal_Int32 nTo = 0; sal_Int32 nFrom = 0; @@ -330,7 +330,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno:: } uno::Any SAL_CALL -ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::getVisible() { bool bVisible = true; uno::Reference< container::XEnumeration > xEnum( createEnumeration(), uno::UNO_QUERY_THROW ); @@ -347,7 +347,7 @@ ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::setVisible( const uno::Any& _visible ) { bool bState = false; if ( _visible >>= bState ) @@ -364,7 +364,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } void SAL_CALL -ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::Select( const uno::Any& Replace ) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) @@ -394,7 +394,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, } void SAL_CALL -ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (css::uno::RuntimeException, std::exception) +ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) { uno::Reference<excel::XWorksheet> xSheet; sal_Int32 nElems = getCount(); @@ -437,7 +437,6 @@ ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (cs //ScVbaCollectionBaseImpl uno::Any SAL_CALL ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) - throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) { @@ -481,7 +480,7 @@ ScVbaWorksheets::getServiceNames() return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) +bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( "nameExists() xSpreadDoc is null", uno::Reference< uno::XInterface >(), 1 ); @@ -502,7 +501,7 @@ bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& return false; } -void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) throw (css::uno::RuntimeException, std::exception) +void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) { // need test, print preview current active sheet // !! TODO !! get view shell from controller diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 82c3e7aeb500..26e8d227df67 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -42,28 +42,27 @@ public: bool isSelectedSheets(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XWorksheets - virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL 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::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL 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 ) override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( const css::uno::Any& Replace ) override; + virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) override; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override; // ScVbaWorksheets_BASE - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) - throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 4b70c34d3fe2..5e319fe7173b 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -72,13 +72,13 @@ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< XHelperInterface >& xPar } uno::Reference< beans::XIntrospectionAccess > -ScVbaWSFunction::getIntrospection() throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::getIntrospection() { return uno::Reference<beans::XIntrospectionAccess>(); } uno::Any SAL_CALL -ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) { // create copy of parameters, replace Excel range objects with UNO range objects uno::Sequence< uno::Any > aParamTemp( Params ); @@ -244,19 +244,19 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno:: } void SAL_CALL -ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) { throw beans::UnknownPropertyException(); } uno::Any SAL_CALL -ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) { throw beans::UnknownPropertyException(); } sal_Bool SAL_CALL -ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::hasMethod(const OUString& Name) { bool bIsFound = false; try @@ -276,13 +276,13 @@ ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException, s } sal_Bool SAL_CALL -ScVbaWSFunction::hasProperty(const OUString& /*Name*/) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::hasProperty(const OUString& /*Name*/) { return false; } OUString SAL_CALL -ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) +ScVbaWSFunction::getExactName( const OUString& aApproximateName ) { OUString sName = aApproximateName.toAsciiUpperCase(); if ( !hasMethod( sName ) ) diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 058794d748cc..eaedf551fdf5 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -33,13 +33,13 @@ class ScVbaWSFunction : public ScVbaWSFunction_BASE public: ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() override; + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; |